summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-04-05 14:36:13 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-04-05 14:36:13 +0200
commit693e9a10c0362708a18799f301e8e68752e3b376 (patch)
tree24ed89d67c723ed22bfb6be8344eee5cb353ba6e /redhat/applications
parent2bccc67f69c937e4db4e12f77182be57dbbb9a6a (diff)
downloadtde-packaging-693e9a10c0362708a18799f301e8e68752e3b376.tar.gz
tde-packaging-693e9a10c0362708a18799f301e8e68752e3b376.zip
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch27
-rw-r--r--redhat/applications/bibletime/bibletime-14.0.0.spec2
-rw-r--r--redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch13
-rw-r--r--redhat/applications/kmplayer/kmplayer-14.0.0.spec7
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec3
5 files changed, 48 insertions, 4 deletions
diff --git a/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch b/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch
new file mode 100644
index 000000000..562dc2812
--- /dev/null
+++ b/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch
@@ -0,0 +1,27 @@
+--- ./bibletime/backend/clanguagemgr.cpp.ORI 2014-02-23 21:50:05.169018790 +0100
++++ ./bibletime/backend/clanguagemgr.cpp 2014-02-23 21:55:06.105229001 +0100
+@@ -95,10 +95,10 @@
+
+ for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) {
+ // for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) {
+- abbrev = (*it)->module()->Lang();
++ const char* mod = (*it)->module()->Lang();
+
+- if (abbrev && !abbrevs.contains(abbrev)) {
+- abbrevs.append( abbrev );
++ if (mod && !abbrevs.contains(mod)) {
++ abbrevs.append( mod );
+ }
+ };
+
+--- ./sword.m4.ori 2014-02-23 22:31:45.119410870 +0100
++++ ./sword.m4 2014-02-23 22:32:45.468246504 +0100
+@@ -28,7 +28,7 @@
+ dnl try to find Sword library files
+ AC_MSG_CHECKING([for Sword library files])
+ AC_REQUIRE([AC_FIND_ZLIB])
+-ac_sword_library_dirs="$ac_sword_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
++ac_sword_library_dirs="$ac_sword_dir/lib64 $ac_sword_dir/lib $exec_prefix/lib $prefix/lib64 $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
+
+ if test "x$ac_static_sword" = "xYES"; then
+ SEARCH_LIBS="libsword.a";
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index 80a34485e..dc30cfc8a 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -55,7 +55,7 @@ BuildRequires: clucene-core-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
-BuildRequires: %{_lib}clucene2-devel
+BuildRequires: %{_lib}clucene-devel
%else
BuildRequires: %{_lib}clucene-devel
%endif
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch b/redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch
new file mode 100644
index 000000000..e365bfa55
--- /dev/null
+++ b/redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch
@@ -0,0 +1,13 @@
+--- trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp.ORI 2014-02-19 22:52:20.875005485 +0100
++++ trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp 2014-02-19 22:53:01.488995960 +0100
+@@ -1094,8 +1094,8 @@
+
+ bool FtpThread::FormatFilelist(const char *filename, TQString current, filist *dirtable, filist *filetable)
+ {
+- int i, blocks, space, month_int = 1;
+- unsigned int loc, fileloc, datebegin, sizebegin = 0;
++ int i, blocks, space, month_int = 1, loc;
++ unsigned int fileloc, datebegin, sizebegin = 0;
+ string buffer, filestring;
+
+ FILE* dirfile;
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
index 912f9cd9a..9425c3f6e 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -63,14 +63,14 @@ BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-devel
+#BuildRequires: gstreamer-plugins-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
%endif
%if 0%{?suse_version}
-BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
%endif
@@ -94,6 +94,7 @@ BuildRequires: libxine-devel
# X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libxt-devel
BuildRequires: libxv-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
@@ -200,7 +201,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-rpath \
--disable-gcc-hidden-visibility
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
index ca908abf0..dd5491f72 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
@@ -53,6 +53,8 @@ AutoReq: no
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0: koffice-i18n-14.0.0-ftbfs.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -546,6 +548,7 @@ Provides: %{name}-tz_TW = %{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -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"