RPM packaging: update R14 packages

redhat/applications/amarok/amarok-14.0.0.spec

@@ -147,8 +147,12 @@ BuildRequires:	%{_lib}inotifytools-devel
 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif

redhat/applications/bibletime/bibletime-14.0.0.spec

@@ -54,8 +54,12 @@ BuildRequires:	gettext
 BuildRequires:	clucene-core-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:	%{_lib}clucene2-devel
+%else
 BuildRequires:	%{_lib}clucene-devel
 %endif
+%endif
 
 # Requires: sword
 BuildRequires:	sword-devel
@@ -104,7 +108,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-%if 0%{?fedora} >= 20
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
   --with-sword-dir=%{tde_prefix}
 %endif
 

redhat/applications/kaffeine/kaffeine-14.0.0.spec

@@ -34,8 +34,6 @@ URL:			http://kaffeine.sourceforge.net/
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch0:			kaffeine-14.0.0-ftbfs.patch
-
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
@@ -110,8 +108,12 @@ BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{pclinuxos}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif
@@ -129,8 +131,10 @@ BuildRequires:	lame-devel
 
 # WTF support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
 BuildRequires:	kernel-headers
 %endif
+%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	glibc-kernheaders 
 %endif
@@ -230,7 +234,6 @@ Requires:		%{name} = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"

redhat/applications/kmplayer/kmplayer-14.0.0.spec

@@ -78,8 +78,12 @@ BuildRequires:	gstreamer-0_10-plugins-base-devel
 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif

redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec

@@ -81,7 +81,11 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-new-ldflags \
   --enable-closure \
   --enable-rpath \
-  --disable-gcc-hidden-visibility
+  --disable-gcc-hidden-visibility \
+  \
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+  --with-sword-dir=%{tde_prefix}
+%endif
 
 %__make %{?_smp_mflags}
 

redhat/applications/tdepowersave/tdepowersave-14.0.0.spec

@@ -40,6 +40,7 @@ Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0:		tdepowersave-14.0.0-test.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -87,6 +88,7 @@ settings for:
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .test
 
 
 %build

redhat/dependencies/tqt3/tqt3-14.0.0.spec

@@ -22,6 +22,8 @@ Prefix:		%{tde_prefix}
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch1:		tqt3-14.0.0-threads.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
 BuildRequires: glibc-devel
@@ -458,6 +460,7 @@ for the TQt 3 toolkit.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1
 
 # fix variables in 'qmake.conf'
 %__sed -i mkspecs/*/qmake.conf \

redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec

@@ -156,6 +156,12 @@ Tools for KSquirrel.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch0 -p1 -b .netpbm
 
+# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype'
+if [ -r /usr/include/freetype2/ftbitmap.h ]; then
+  %__sed -i "configure.ac" -e "s|freetype/ftbitmap.h|freetype2/ftbitmap.h|"
+  %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|"
+fi
+
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
@@ -164,7 +170,6 @@ Tools for KSquirrel.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \

redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec

@@ -59,6 +59,7 @@ BuildRequires:	libxcb-devel
 BuildRequires:	%{_lib}xcb-devel
 %endif
 
+# X11 stuff
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}xi-devel
 %if 0%{?mgaversion} >= 4
@@ -81,6 +82,13 @@ BuildRequires:	libXau-devel
 BuildRequires:	xorg-x11-devel
 %endif
 
+# Broken PNG images
+%if 0%{?mgaversion} >= 4 || 0%{?fedora} >= 20
+BuildRequires:	kde-dev-scripts
+BuildRequires:	optipng
+BuildRequires:	advancecomp
+%endif
+
 Obsoletes:		trinity-kdeaccessibility < %{version}-%{release}
 Provides:		trinity-kdeaccessibility = %{version}-%{release}
 Obsoletes:		trinity-kdeaccessibility-libs < %{version}-%{release}
@@ -465,7 +473,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 # 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
 
 %configure \
@@ -495,6 +503,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+if [ -x /usr/bin/optimizegraphics ]; then
+  (cd %{?buildroot} && /usr/bin/optimizegraphics)
+fi
+
 
 %clean
 %__rm -rf %{buildroot}

redhat/tdeaddons/tdeaddons-14.0.0.spec

@@ -55,12 +55,16 @@ BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: openssl-devel
 
-# DB4 support
+# DB4/DB5 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
 %define with_db 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:	db4-devel
+%else
 BuildRequires:	db5-devel
 %endif
+%endif
 %if 0%{?fedora} >= 18
 BuildRequires:	libdb-devel
 BuildRequires:	libdb-cxx-devel
@@ -681,9 +685,14 @@ if ! rpm -E %%cmake|grep -q "cd build"; then
   cd build
 fi
 
+# Help cmake to find DB headers ...
 if [ -d "/usr/include/db53" ]; then
   export CMAKE_INCLUDE_PATH="/usr/include/db53"
 fi
+if [ -d "/usr/include/db4" ]; then
+  export CMAKE_INCLUDE_PATH="/usr/include/db4"
+fi
+
 
 %cmake \
   -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

redhat/tdebase/tdebase-14.0.0.spec

@@ -76,35 +76,39 @@ Source9:	mgabutton.svg
 %endif
 
 # Patch party !
+Patch0:		tdebase-14.0.0-ftbfs.patch
+Patch2:		tdebase-14.0.0-kickoff_confirm_logout.patch
+Patch3:		tdebase-fadeaway.diff
+Patch4:		tdebase-fadeaway2.diff
 
 # Permanent patches, all TDE versions
 ## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
-Patch1:		tdebase-14.0.0-open_terminal_here.patch
+Patch101:		tdebase-14.0.0-open_terminal_here.patch
 ## [tdebase] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
-Patch2:		tdebase-14.0.0-default_menu_icon.patch
+Patch102:		tdebase-14.0.0-default_menu_icon.patch
 ## [tdebase/kcontrol] Adds FR translation for KCM ICC
-Patch3:		tdebase-14.0.0-displayconfig_translation.patch
+Patch103:		tdebase-14.0.0-displayconfig_translation.patch
 ## [tdebase/kicker] Adds default entries for Kickoff menu
-Patch4:		tdebase-14.0.0-kickoff_default_favs.patch
+Patch104:		tdebase-14.0.0-kickoff_default_favs.patch
 ## [tdebase] Changes konsole default word separator
-Patch5:		tdebase-14.0.0-konsole_wordseps.patch
+Patch105:		tdebase-14.0.0-konsole_wordseps.patch
 
 # Permanent patches, this TDE version only
 
 # Patches from Mandriva
-Patch101:	tdebase-14.0.0-vibrate_dialog.patch
+Patch201:	tdebase-14.0.0-vibrate_dialog.patch
-Patch102:	tdebase-14.0.0-kcontrol_menu_entry.patch
+Patch202:	tdebase-14.0.0-kcontrol_menu_entry.patch
-Patch103:	tdebase-14.0.0-kdesktop_crossfade.patch
+Patch203:	tdebase-14.0.0-kdesktop_crossfade.patch
-Patch104:	tdebase-14.0.0-kickoff_xdg_dirs.patch
+Patch204:	tdebase-14.0.0-kickoff_xdg_dirs.patch
-Patch105:	tdebase-14.0.0-suspend_unmount.patch
+Patch205:	tdebase-14.0.0-suspend_unmount.patch
-Patch106:	tdebase-14.0.0-bookmark_global_copy.patch
+Patch206:	tdebase-14.0.0-bookmark_global_copy.patch
 
 # Experimental patches
-Patch201:	tdebase-14.0.0-kcm_xcursor_applytheme.patch
+Patch301:	tdebase-14.0.0-kcm_xcursor_applytheme.patch
 ## [tdebase] Fix i18n description loading in 'twin_update_default_rules'
-Patch202:	tdebase-14.0.0-fix_twin_rules_translation.patch
+Patch302:	tdebase-14.0.0-fix_twin_rules_translation.patch
 
-Patch203:	tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
+Patch303:	tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
 
 
 ### Distribution-specific settings ###
@@ -1157,6 +1161,7 @@ plugdev group.
 %{tde_datadir}/services/kuriikwsfilter.desktop
 %{tde_datadir}/services/kurisearchfilter.desktop
 %{tde_datadir}/services/localdomainurifilter.desktop
+%{tde_tdedocdir}/HTML/en/tdefontview/
 
 %{tde_datadir}/apps/usb.ids
 %{tde_datadir}/apps/kcmview1394/oui.db
@@ -1175,6 +1180,7 @@ plugdev group.
 %{tde_tdeappdir}/tderandrtray.desktop
 %{tde_datadir}/applnk/.hidden/randr.desktop
 %{tde_datadir}/autostart/tderandrtray-autostart.desktop
+%{tde_tdedocdir}/HTML/en/tderandrtray/
 %endif
 
 %post -n trinity-kcontrol
@@ -1912,6 +1918,7 @@ Installation of smbclient will make you able to use smb shared printers.
 %{tde_datadir}/services/printdb.protocol
 %{tde_tdedocdir}/HTML/en/tdeprint/
 %{tde_tdedocdir}/HTML/en/tdeprintfax/
+%{tde_tdedocdir}/HTML/en/kjobviewer/
 
 %post -n trinity-tdeprint
 /sbin/ldconfig || :
@@ -2344,7 +2351,7 @@ functionality.
 %{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
 %{tde_datadir}/apps/clockapplet/pics/lcd.png
 %{tde_datadir}/apps/tdeconf_update/kicker-3.1-properSizeSetting.pl
-%{tde_datadir}/apps/tdeconf_update/kicker-3.5-tdeconfigXTize.pl
+#%{tde_datadir}/apps/tdeconf_update/kicker-3.5-tdeconfigXTize.pl
 %{tde_datadir}/apps/tdeconf_update/kicker-3.5-taskbarEnums.pl
 %{tde_datadir}/apps/tdeconf_update/kickerrc.upd
 %{tde_datadir}/apps/kicker/
@@ -3064,8 +3071,8 @@ ktip provides many useful tips on using TDE when you log in.
 %{tde_bindir}/ktip
 %{tde_tdeappdir}/ktip.desktop
 %{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/kdewizard/pics/wizard_small.png
+%{tde_datadir}/apps/tdewizard/pics/wizard_small.png
-%{tde_datadir}/apps/kdewizard/tips
+%{tde_datadir}/apps/tdewizard/tips
 %{tde_datadir}/autostart/ktip.desktop
 %{tde_datadir}/icons/hicolor/*/apps/ktip.*
 
@@ -3296,23 +3303,28 @@ Windows and Samba shares.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .openterminalhere
+%patch0 -p1 -b .ftbfs
-%patch2 -p1 -b .startmenuicon
+%patch2 -p1 -b .kickofflogout
-%patch3 -p1 -b .displayconfigtranslation
+%patch3 -p1 -b .fadeaway
-%patch4 -p1 -b .kickoffdefaultsfav
+%patch4 -p1 -b .fadeaway2
-%patch5 -p1 -b .konsolewordseps
+
-
+%patch101 -p1 -b .openterminalhere
-%patch101 -p1 -b .vibrate_dialog
+%patch102 -p1 -b .startmenuicon
-%patch102 -p1 -b .kcontrol_menu_entry
+%patch103 -p1 -b .displayconfigtranslation
-%patch103 -p1 -b .kdesktop_crossfade
+%patch104 -p1 -b .kickoffdefaultsfav
-%patch104 -p1 -b .kickoff_xdg
+%patch105 -p1 -b .konsolewordseps
-%patch105 -p1 -b .suspend_unmount
+
-%patch106 -p1 -b .bookmark_global_copy
+%patch201 -p1 -b .vibrate_dialog
-
+%patch202 -p1 -b .kcontrol_menu_entry
-%patch201 -p1 -b .kcmxcursor
+%patch203 -p1 -b .kdesktop_crossfade
-%patch202 -p1 -b .twintranslation
+%patch204 -p1 -b .kickoff_xdg
-
+%patch205 -p1 -b .suspend_unmount
-%patch203 -p1 -b .iocharset
+%patch206 -p1 -b .bookmark_global_copy
+
+%patch301 -p1 -b .kcmxcursor
+%patch302 -p1 -b .twintranslation
+
+%patch303 -p1 -b .iocharset
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""

redhat/tdelibs/tdelibs-14.0.0.spec

@@ -36,10 +36,16 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch11:		tdelibs-14.0.0-displayconfig_crash.patch
+Patch12:		tdelibs-14.0.0-reduce_tdehwlib_cpueagerness.patch
+
 # Patches from Mandriva
 Patch101:		tdelibs-14.0.0-xdg_dirs_set_path.patch
 Patch102:		tdelibs-14.0.0-cups_by_default.patch
 
+# Enables the 'kddebug' feature even when built with '-DNDEBUG'
+Patch201:		tdelibs-14.0.0-enable_kddebug.patch
+
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs < %{version}-%{release}
@@ -450,9 +456,14 @@ applications for TDE.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+%patch11 -p1 -b .displayconfigcrash
+%patch12 -p1 -b .tdehwlib
+
 %patch101 -p1 -b .xdg_path
 %patch102 -p1 -b .cups_by_default
 
+#patch201 -p1 -b .kddebug
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -501,6 +512,7 @@ fi
   -DWITH_TDEHWLIB_DAEMONS=ON \
   %{?with_hal:-DWITH_HAL=ON} \
   %{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \
+  -DWITH_LOGINDPOWER=ON \
   %{?!with_upower:-DWITH_UPOWER=OFF} \
   %{?!with_udisks:-DWITH_UDISKS=OFF} \
   %{?!with_udisks2:-DWITH_UDISKS2=OFF} \

redhat/tdemultimedia/tdemultimedia-14.0.0.spec

@@ -133,8 +133,12 @@ BuildRequires:	libXt-devel
 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif
@@ -1143,6 +1147,11 @@ noatun plugins.
 
 ##########
 
+# FIXME 2014/03/15: FTBFS on PCLINUXOS ... Need to remove -fstack-protector
+%if 0%{?pclinuxos}
+%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
+%endif
+
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
@@ -1188,7 +1197,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
   %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install