| 693e9a10 | 2014-04-05 07:36:13 | François Andriot |
RPM Packaging: update R14 packages |
||
|
A redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch A redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch M redhat/applications/bibletime/bibletime-14.0.0.spec M redhat/applications/kmplayer/kmplayer-14.0.0.spec M redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec M redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec M redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec M redhat/tdebase/tdebase-14.0.0.spec M redhat/tdebindings/tdebindings-14.0.0.spec M redhat/tdegraphics/tdegraphics-14.0.0.spec M redhat/tdenetwork/tdenetwork-14.0.0.spec M redhat/tdepim/tdepim-14.0.0.spec |
||
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 0000000..562dc28
--- /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 80a3448..dc30cfc 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -55,7 +55,7 @@
%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 0000000..e365bfa
--- /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 912f9cd..9425c3f 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -63,14 +63,14 @@
%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 @@
# 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 @@
--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 ca908ab..dd5491f 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 @@
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 @@
%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"
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index b3f3294..48a4b27 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -61,7 +61,7 @@
%endif
# DJVU support
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_djvu 1
BuildRequires: djvulibre
%endif
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index d47264b..9595c36 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -56,7 +56,9 @@
BuildRequires: libxcb-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
BuildRequires: %{_lib}xcb-devel
+%endif
%endif
# X11 stuff
@@ -156,7 +158,7 @@
Group: User Interface/Desktops
%description -n trinity-kmag
-KDE's screen magnifier tool.
+TDE's screen magnifier tool.
You can use KMagnifier to magnify a part of the screen just as you would use
a lens to magnify a newspaper fine-print or a photograph. This application is
@@ -377,8 +379,8 @@
%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
+#%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
+#%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
%{tde_tdedocdir}/HTML/en/kttsd/
%post -n trinity-kttsd
@@ -503,6 +505,11 @@
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
+# Avoid conflict with tdelibs
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
+
+
if [ -x /usr/bin/optimizegraphics ]; then
(cd %{?buildroot} && /usr/bin/optimizegraphics)
fi
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 35a148f..6e4d82b 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -472,7 +472,51 @@
BuildRequires: libxkbfile-devel
%endif
-# X11 stuff ...
+# XDMCP support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xdmcp-devel
+%else
+BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires: libXdmcp-devel
+%endif
+
+# XTST support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xtst-devel
+%else
+BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires: libXtst-devel
+%endif
+
+# XDAMAGE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xdamage-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires: libXdamage-devel
+%endif
+
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xcomposite-devel
+%else
+BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires: libXcomposite-devel
+%endif
+
+# Other X11 stuff ...
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
@@ -486,25 +530,11 @@
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xdamage-devel
-%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}xcomposite-devel
-BuildRequires: %{_lib}xdmcp-devel
-BuildRequires: %{_lib}xtst-devel
-%else
** Diff limit reached (max: 250 lines) **
|
||
| a0e2d0cf | 2014-04-05 07:36:47 | François Andriot |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging |
||
|
M debian/lenny/tdenetwork/debian/control M debian/lenny/tdenetwork/debian/rules M debian/squeeze/tdenetwork/debian/control M debian/squeeze/tdenetwork/debian/rules M debian/wheezy/tdenetwork/debian/control M debian/wheezy/tdenetwork/debian/rules M ubuntu/maverick/tdenetwork/debian/control M ubuntu/maverick/tdenetwork/debian/rules M ubuntu/precise/tdenetwork/debian/control M ubuntu/precise/tdenetwork/debian/rules M ubuntu/raring/tdenetwork/debian/control M ubuntu/raring/tdenetwork/debian/rules |
||
** Diff limit reached (max: 250 lines) ** |
||