diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-08-05 20:25:18 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-08-05 20:25:18 +0200 |
| commit | 562049cd694f6dd0927b9880227fc4f6da008839 (patch) | |
| tree | e939e442f1fb29ff29811ebc02f672ecf62a47c1 /redhat/main/tdeedu | |
| parent | 6253ed4f8177cb33fef709fb7e215ff94e6300c1 (diff) | |
| download | tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.tar.gz tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.zip | |
RPM Packaging: massive update
Diffstat (limited to 'redhat/main/tdeedu')
| -rw-r--r-- | redhat/main/tdeedu/tdeedu-14.0.0.spec | 5 | ||||
| -rw-r--r-- | redhat/main/tdeedu/tdeedu-14.0.1-ftbfs.patch | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec index a275ef5ce..f2e573cd5 100644 --- a/redhat/main/tdeedu/tdeedu-14.0.0.spec +++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec @@ -1362,6 +1362,11 @@ This package contains the development files for tdeedu. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +# RHEL5 strange FTBFS on V4L stuff +%if 0%{?rhel} == 5 +%__sed -i "admin/acinclude.m4.in" -e "s|-ansi||" +%endif + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/main/tdeedu/tdeedu-14.0.1-ftbfs.patch b/redhat/main/tdeedu/tdeedu-14.0.1-ftbfs.patch new file mode 100644 index 000000000..732ffe88f --- /dev/null +++ b/redhat/main/tdeedu/tdeedu-14.0.1-ftbfs.patch @@ -0,0 +1,13 @@ +--- trinity-tdeedu-14.0.1/kstars/configure.in.in.orig 2015-07-31 11:34:32.712141661 -0400 ++++ trinity-tdeedu-14.0.1/kstars/configure.in.in 2015-07-31 11:35:49.442314137 -0400 +@@ -87,7 +87,9 @@ + [have_v4l2=true], + [have_v4l2=false], + [#include <sys/time.h> +- #include <linux/videodev2.h>]) ++ extern "C" { ++ #include <linux/videodev2.h> ++ }]) + if test x$have_v4l2 = xfalse; then + unset ac_cv_type_struct_v4l2_buffer + AC_CHECK_TYPE([struct v4l2_buffer], |