From 693e9a10c0362708a18799f301e8e68752e3b376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 5 Apr 2014 14:36:13 +0200 Subject: [PATCH] RPM Packaging: update R14 packages --- .../bibletime/bibletime-14.0.0-ftbfs.patch | 27 ++++++++ .../bibletime/bibletime-14.0.0.spec | 2 +- .../kasablanca-14.0.0-fix_ftp.patch | 13 ++++ .../kmplayer/kmplayer-14.0.0.spec | 7 +- .../koffice-i18n/koffice-i18n-14.0.0.spec | 3 + .../libksquirrel/libksquirrel-14.0.0.spec | 2 +- .../tdeaccessibility-14.0.0.spec | 13 +++- redhat/tdebase/tdebase-14.0.0.spec | 65 ++++++++++++++----- redhat/tdebindings/tdebindings-14.0.0.spec | 19 ++++++ redhat/tdegraphics/tdegraphics-14.0.0.spec | 2 +- redhat/tdenetwork/tdenetwork-14.0.0.spec | 8 +-- redhat/tdepim/tdepim-14.0.0.spec | 7 ++ 12 files changed, 140 insertions(+), 28 deletions(-) create mode 100644 redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch create mode 100644 redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch 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" diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec index b3f329402..48a4b275e 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec @@ -61,7 +61,7 @@ BuildRequires: libungif-devel %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 d47264b1a..9595c3654 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -56,8 +56,10 @@ BuildRequires: libXtst-devel BuildRequires: libxcb-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?pclinuxos} == 0 BuildRequires: %{_lib}xcb-devel %endif +%endif # X11 stuff %if 0%{?mgaversion} || 0%{?mdkversion} @@ -156,7 +158,7 @@ Summary: A screen magnifier for TDE 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 @@ Homepage: http://accessibility.kde.org/developer/kttsd %{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 @@ export PATH="%{tde_bindir}:${PATH}" %__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 35a148f16..6e4d82b1b 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -472,7 +472,51 @@ BuildRequires: xorg-x11-libxkbfile-devel 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 @@ BuildRequires: libfontenc-devel %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 -BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel -BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel -%endif BuildRequires: x11-font-util BuildRequires: x11-proto-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXcomposite-devel -BuildRequires: libXdamage-devel -BuildRequires: libXdmcp-devel -BuildRequires: libXtst-devel BuildRequires: xorg-x11-proto-devel %endif @@ -521,6 +551,9 @@ BuildRequires: bdftopcf BuildRequires: drakconf %endif +# Needed for "compton" stuff +BuildRequires: libconfig-devel + # tdebase is a metapackage that installs all sub-packages Requires: %{name}-runtime-data-common = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} @@ -1213,6 +1246,7 @@ TDE applications, particularly those in the TDE base module. %attr(4511,root,root) %{tde_bindir}/tdmtsak %{tde_bindir}/tsak %endif +%{tde_bindir}/compton-tde %{tde_bindir}/tdedebugdialog %{tde_bindir}/kreadconfig %{tde_bindir}/kwriteconfig @@ -3416,6 +3450,7 @@ fi -DWITH_SENSORS=ON \ -DWITH_HAL=OFF \ -DWITH_TDEHWLIB=ON \ + -DWITH_ELFICON=OFF \ -DWITH_UPOWER=ON \ \ -DBUILD_ALL=ON \ diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec index 0ad288c6a..ecc1090ac 100644 --- a/redhat/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/tdebindings/tdebindings-14.0.0.spec @@ -123,8 +123,18 @@ BuildRequires: python-devel ## ruby BuildRequires: ruby-devel >= 1.8, ruby +%if "%{?ruby_libarchdir}" != "" +%define ruby_arch %{?ruby_libarchdir} +%else %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} +%endif + +%if "%{?ruby_libdir}" != "" +%define ruby_rubylibdir %{?ruby_libdir} +%else %{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')} +%endif + # Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') @@ -980,6 +990,10 @@ Development files for the TDE bindings. %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %patch1 -p1 -b .ftbfs +%if "%{?perl_vendorarch}" == "" +exit 1 +%endif + %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %patch5 -p1 -b .ruby %endif @@ -1018,6 +1032,11 @@ if [ -d /usr/evolution28 ]; then export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" fi +# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h +%if 0%{?suse_version} >= 1310 +EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}" +%endif + # Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ --prefix=%{tde_prefix} \ diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec index 7eb39cdeb..15eac88dd 100644 --- a/redhat/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec @@ -1284,7 +1284,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi if ! rpm -E %%cmake|grep -q "cd build"; then diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index 79b354a31..0c8090e8f 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -292,8 +292,8 @@ development-related files for the TDE network module. %{tde_libdir}/libtdeinit_ksirc.la %{tde_libdir}/libkopete.la %{tde_libdir}/libkopete.so -%{tde_libdir}/libkopete_msn_shared.la -%{tde_libdir}/libkopete_msn_shared.so +#%{tde_libdir}/libkopete_msn_shared.la +#%{tde_libdir}/libkopete_msn_shared.so %{tde_libdir}/libkopete_oscar.la %{tde_libdir}/libkopete_oscar.so %{tde_libdir}/libkopete_videodevice.la @@ -509,7 +509,7 @@ URL: http://kopete.kde.org %description -n trinity-kopete Kopete is an instant messenger program which can communicate with a variety -of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber. +of IM systems, such as Yahoo, ICQ, IRC and Jabber. Support for more IM protocols can be added through a plugin system. @@ -536,7 +536,7 @@ Support for more IM protocols can be added through a plugin system. %{tde_tdelibdir}/kopete_*.so %{tde_tdelibdir}/libkrichtexteditpart.la %{tde_tdelibdir}/libkrichtexteditpart.so -%{tde_libdir}/libkopete_msn_shared.so.* +#%{tde_libdir}/libkopete_msn_shared.so.* %{tde_libdir}/libkopete_oscar.so.* %{tde_libdir}/libkopete.so.* %{tde_libdir}/libkopete_videodevice.so.* diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec index ceeb55886..bdd4c9c65 100644 --- a/redhat/tdepim/tdepim-14.0.0.spec +++ b/redhat/tdepim/tdepim-14.0.0.spec @@ -712,6 +712,8 @@ Requires: libcaldav Requires: libcarddav Obsoletes: tdepim-tderesources-devel < %{version}-%{release} +Obsoletes: trinity-tdepim-kresources-devel < %{version}-%{release} +Provides: trinity-tdepim-kresources-devel = %{version}-%{release} %description tderesources-devel %{summary} @@ -2210,6 +2212,11 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +# Specific path for RHEL4 +if [ -d "/usr/X11R6" ]; then + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +fi + if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build cd build