diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-26 09:53:33 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-26 09:53:33 +0200 |
| commit | a6addf0c3f16eff1463d765975721a92e69c053b (patch) | |
| tree | 7fbe8636b75d9e4c5594a02fede95a18e41e53dd /redhat/extras | |
| parent | 8b0482ca988f8036b84d093f89453f3235fda484 (diff) | |
| download | tde-packaging-a6addf0c3f16eff1463d765975721a92e69c053b.tar.gz tde-packaging-a6addf0c3f16eff1463d765975721a92e69c053b.zip | |
RPM Packaging: some updates
Diffstat (limited to 'redhat/extras')
| -rw-r--r-- | redhat/extras/akode/akode-14.0.0.spec | 9 | ||||
| -rw-r--r-- | redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch | 20 |
2 files changed, 22 insertions, 7 deletions
diff --git a/redhat/extras/akode/akode-14.0.0.spec b/redhat/extras/akode/akode-14.0.0.spec index 7d59fccd3..bac85626d 100644 --- a/redhat/extras/akode/akode-14.0.0.spec +++ b/redhat/extras/akode/akode-14.0.0.spec @@ -42,7 +42,7 @@ Patch4: akode-2.0.2-gcc43.patch # New patch for Fedora 16 / TDE 3.5.13 Patch10: akode-autotools.patch Patch11: akode-2.0.2-fix_ffmpeg_include.patch - +Patch12: akode-2.0.2-fix_ftbfs.patch # FLAC support %define _with_flac --with-flac @@ -288,12 +288,7 @@ Requires: %{name} = %{version}-%{release} %patch10 -p1 -b .autotools %patch11 -p1 -b .ffmpeg - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%patch12 -p1 -b .ftbfs %__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" diff --git a/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch b/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch new file mode 100644 index 000000000..96aa0f38f --- /dev/null +++ b/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch @@ -0,0 +1,20 @@ +--- ./akode/lib/akodelib.h.ORI 2013-07-25 11:49:19.524457787 +0200 ++++ ./akode/lib/akodelib.h 2013-07-25 11:49:23.056360414 +0200 +@@ -34,13 +34,13 @@ + #include <inttypes.h> + #else + typedef signed char int8_t; +-typedef unsigned char int8_t; ++typedef unsigned char uint8_t; + typedef signed short int16_t; +-typedef unsigned short int16_t; ++typedef unsigned short uint16_t; + typedef signed int int32_t; + typedef unsigned int uint32_t; +-typedef signed long long int64_t; +-typedef unsigned long long uint64_t; ++typedef signed long int64_t; ++typedef unsigned long uint64_t; + #endif + + #endif |