RPM Packaging: update existing SPEC files

5 files changed, 112 insertions, 423 deletions

diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
index 27bac51d2..25b95d31b 100644
--- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
+++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
@@ -106,7 +106,7 @@ KDE Bluetooth framework development libraries and headers.
 %patch3 -p1 -b .gcc46
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#patch4 -p1 -b .bluez4
+%patch4 -p1 -b .bluez4
 %endif
 
 %patch11 -p1
@@ -156,7 +156,7 @@ export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir}/dbus-1.0"
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
diff --git a/redhat/extras/libkarma/trinity-libkarma.spec b/redhat/extras/libkarma/trinity-libkarma.spec
deleted file mode 100644
index 2bf58f756..000000000
--- a/redhat/extras/libkarma/trinity-libkarma.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Summary:   	Rio Karma tools
-Name:      	trinity-libkarma
-Version:   	0.1.2
-Release:   	2%{?dist}%{?_variant}
-License:   	GPLv2+
-Group:     	System/Libraries
-Url:	   	http://www.freakysoft.de/html/libkarma/
-
-Source:   	http://www.freakysoft.de/libkarma/libkarma-%{version}.tar.gz
-Source2:	http://bobcopeland.com/karma/banshee/preferences.fdi
-Source3:	http://bobcopeland.com/karma/banshee/multimedia-player-rio-karma.png
-Source4:	karma-sharp.dll.config
-
-# [libkarma] Fix installation directories
-Patch1:		libkarma-0.1.2-fix_installation.patch
-
-BuildRoot: 	%{_tmppath}/%name-root
-
-BuildRequires: mono-devel
-BuildRequires: taglib-devel
-BuildRequires: libusb-devel
-BuildRequires: zlib-devel
-
-Obsoletes:		trinity-libkarma-libs < %{version}-%{release}
-Provides:		trinity-libkarma-libs = %{version}-%{release}
-
-Provides:		libkarma = %{version}-%{release}
-
-%description
-Rio Karma access library
-
-
-%package devel
-Summary:   	Rio Karma development files
-Group:     	Development/C
-Requires:	%{name} = %{version}-%{release}
-Provides:	libkarma-devel = %{version}-%{release}
-
-%description devel
-Rio Karma development files
-
-
-%package -n trinity-karma-sharp
-Summary:   	Rio Karma C# bindings
-Group:     	Development/Other
-Requires:	%{name} = %{version}-%{release}
-
-Obsoletes:	karma-sharp < %{version}-%{release}
-Provides:	karma-sharp = %{version}-%{release}
-
-%description -n trinity-karma-sharp
-Rio Karma C# bindings
-
-
-%prep
-%setup -q -n libkarma-%{version}
-%patch1 -p1 -b .fixdir
-
-%build
-# Do *NOT* use LIBDIR variable, it is used for internal purpose !!!
-%__make \
-  DESTDIR=%{?buildroot} \
-  PREFIX=%{tde_prefix} \
-  LIB=%{_lib}
-  
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__mkdir_p $RPM_BUILD_ROOT
-
-%__make install \
-  DESTDIR=%{?buildroot} \
-  PREFIX=%{tde_prefix} \
-  LIB=%{_lib} \
-  CHOWNPROG=/bin/true \
-  CHGRPPROG=/bin/true
-
-
-install -m 644 -D libkarma.fdi %buildroot%_sysconfdir/hal/fdi/information/20-rio-karma.fdi
-install -m 644 -D %SOURCE2 %buildroot%_sysconfdir/hal/fdi/policy/preferences.fdi
-install -m 644 -D %SOURCE3 %buildroot%{tde_datadir}/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
-
-cat > README%{?dist} << EOF
-For automatic mounting, add the following line to your
-/etc/fstab. Otherwise gnome-volume-manager will refuse to mount the
-device, as it doesn't know about the Karma's proprietary filesystem.
-
-/dev/disk/by-id/usb-Rio_Rio_Karma_0000000000000000-part2    /media/karma    omfs    user,noauto    0   0
-
-EOF
-
-install -m 644 -D %SOURCE4 %buildroot%{tde_libdir}/karma-sharp/karma-sharp.dll.config
-
-# Removes doc
-%__rm -rf %{?buildroot}%{tde_docdir}/libkarma/
-
-
-%post
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc ChangeLog THANKS TODO README%{?dist}
-%config(noreplace) %_sysconfdir/hal/fdi/information/20-rio-karma.fdi
-%config(noreplace) %_sysconfdir/hal/fdi/policy/preferences.fdi
-%{tde_bindir}/riocp
-%{tde_bindir}/chprop
-%{tde_mandir}/man1/*.1*
-%attr(4755,root,root) %{tde_bindir}/karma_helper
-%{tde_datadir}/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
-%{tde_libdir}/libkarma.so.0*
-
-%files devel
-%defattr(-,root,root)
-%{tde_includedir}/libkarma/
-%{tde_libdir}/libkarma.a
-%{tde_libdir}/libkarma.so
-
-%files -n trinity-karma-sharp
-%defattr(-,root,root)
-%{tde_libdir}/karma-sharp/*
-%{tde_libdir}/pkgconfig/karma-sharp.pc
-
-
-
-
-%changelog
-* Fri Aug 03 2012 Francois Andriot <[email protected]> 0.1.2-2
-- Add support for MGA2 and MDV2011
-- Removes 'libs' subpackage
-- Fix installation directories
-
-* Mon Apr 30 2012 Francois Andriot <[email protected]> 0.1.2-1
-- Build for RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17
-- Based on 'libkarma-0.1.2-1mdv2011.0'
-
diff --git a/redhat/extras/theme-baghira/trinity-theme-baghira.spec b/redhat/extras/theme-baghira/trinity-theme-baghira.spec
deleted file mode 100644
index 78d77eed8..000000000
--- a/redhat/extras/theme-baghira/trinity-theme-baghira.spec
+++ /dev/null
@@ -1,204 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:                   trinity-theme-baghira
-Version:                0.8
-Release:                1%{?dist}%{?_variant}
-Summary:                Baghira theme for Trinity
-License:                GPL
-Group:                  Graphical desktop/KDE
-Source0:		http://prdownloads.sourceforge.net/baghira/baghira-%{version}.tar.bz2
-Source1:				admin-3.5.13.1.tar.gz
-Patch0:					baghira-3.5.13.1-fix_ftbfs.patch
-Url:                    http://baghira.sourceforge.net/
-BuildRequires:          X11-devel
-BuildRequires:          jpeg-devel
-BuildRequires:          qt3-devel
-BuildRequires:          trinity-tdebase-devel
-BuildRoot:              %{_tmppath}/baghira-%{version}-buildroot
-
-%description
-Baghira is a very nice native Trinity style and windec
-originally based on Mosfet's Liquid style.
-
-This package contains non-free icons..
-
-%package devel
-Summary:        Header files and static libraries from %name
-Group:          Development/C
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-Libraries and includes files for
-developing programs based on %name
-
-This package is in PLF because it contains non-free icons.
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-%prep
-%setup -q -n baghira-%{version}
-%setup -q -n baghira-%{version} -a 1
-%patch0 -p1 -b .ftbfs
-
-%__rm -rf admin
-%__mv -f admin-3.5.13.1 admin
-
-# 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"
-
-%__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"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export KDEDIR=%{tde_prefix}
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --datadir=%{tde_datadir} \
-  --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
-  --disable-static \
-  --disable-rpath \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-install -d %{buildroot}/%{tde_libdir}/baghira-%{version}
-install -d %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}
-
-mv %{buildroot}/%{tde_libdir}/libbaghirastarter.la %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.la
-mv %{buildroot}/%{tde_libdir}/libbaghirastarter.so %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so.%{major}
-mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.la %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la
-mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.so %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so.%{major}
-mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebar.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h
-mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebariface.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h
-mv %{buildroot}/%{tde_tdeincludedir}/dndlistbox.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h
-mv %{buildroot}/%{tde_tdeincludedir}/linkview.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/linkview.h
-mv %{buildroot}/%{tde_tdeincludedir}/listboxlink.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h
-
-ln -s libbaghirastarter.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so
-ln -s usermanager_panelapplet.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING NEWS TODO
-%{tde_bindir}/bab
-%{tde_tdelibdir}/b_menu_panelapplet.*
-%{tde_tdelibdir}/kstyle_baghira_config.*
-%{tde_tdelibdir}/kwin3_baghira.*
-%{tde_tdelibdir}/kwin_baghira_config.*
-%{tde_tdelibdir}/plugins/styles/baghira.*
-%{tde_datadir}/apps/kdisplay/color-schemes/Aqua*
-#%{tde_datadir}/apps/kicker/applets/b_menuapplet.desktop
-%{tde_datadir}/apps/kicker/applets/usermanager.desktop
-%{tde_datadir}/apps/konqsidebartng/add/baghirasidebar_add.desktop
-%{tde_datadir}/apps/konqsidebartng/entries/baghirasidebar.desktop
-%{tde_datadir}/apps/kicker/applets/starter.desktop
-%{tde_datadir}/apps/kstyle/themes/baghira.themerc
-%{tde_datadir}/apps/kwin/baghira.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/baghira*
-%{tde_datadir}/icons/crystalsvg/*/*/bab_*
-%{tde_datadir}/apps/baghira/poof.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_down.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_hover.png
-
-
-%files devel
-%defattr(-,root,root)
-%{tde_libdir}/baghira-%{version}/libbaghirastarter.la
-%{tde_libdir}/baghira-%{version}/libbaghirastarter.so*
-%{tde_tdelibdir}/konqsidebar_baghirasidebar.la
-%{tde_tdelibdir}/konqsidebar_baghirasidebar.so
-%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la
-%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so*
-%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h
-%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h
-%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h
-%{tde_tdeincludedir}/baghira-%{version}/linkview.h
-%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h
-
-
-%changelog
-* Tue Nov 20 2012 Francois Andriot <[email protected]> - 0.8.1
-- Initial build for TDE 3.5.13.1
-
-* Tue Jan 8 2008 Javier Rodas <[email protected]> 0.8-2plf2008.1
-- KDE 3.5.8 version in Mandriva 2008.1
-- KDE svn admin headers now packaged in Source1
-
-* Mon Sep 18 2006 Javier Rodas <[email protected]> 0.8-2plf2007.0
-- Fix Source0 local reference
-- KDE 3.5.4 admin headers are downloaded with subversion
-- Fix Baghira devel package directory paths
-- Fix BuildRequires
-
-* Fri Sep 15 2006 Javier Rodas <[email protected]> 0.8-1plf2007.0
-- 0.8
-- Replaced KDE admin headers in the source file (for KDE 3.5.4)
-- Fix BuildRequires
-- Removed the patch file
-
-* Thu Oct 13 2005 neoclust <[email protected]> 0.7-1plf
-- 0.7
-- remove redundant buildrequires
-
-* Mon Mar 04 2005 Nicolas L�ureuil <[email protected]> 0.6-3plf
-- Add PLF reason
-- bzipped patch 
-- Make rpmlint happier
-
-* Mon Mar 04 2005 Nicolas L�ureuil <[email protected]> 0.6-2plf
-- New version
-- Fix compile ( Patch0 from Gentoo)
-- Spec Cleanup
-- rpmbuildupdatable
-
-* Mon Dec 06 2004 Laurent Culioli <[email protected]> 0.6-1plf
-- Initial Release.
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 45917cdf6..b41d48879 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -1,11 +1,12 @@
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %define _docdir %{_datadir}/doc
+%define tde_datadir %{tde_prefix}/share
 %endif
 
 Name:		trinity-desktop
-Version:	3.5.13.1
+Version:	3.5.13.2
 Release:	1%{?dist}%{?_variant}
 License:	GPL
 Summary:	Meta-package to install TDE
@@ -21,9 +22,10 @@ BuildArch:	noarch
 
 Source0:	trinity-3.5.13-fedora.repo
 Source1:	trinity-3.5.13-rhel.repo
+Source2:	RPM-GPG-KEY-trinity
 
-Obsoletes:	trinity-desktop-extras < %{version}-%{release}
-Provides:	trinity-desktop-extras = %{version}-%{release}
+Source11:	pclinuxos201304-32.jpg
+Source12:	pclinuxos201304-64.jpg
 
 Requires:	trinity-tdeaccessibility >= %{version}
 Requires:	trinity-tdeaddons >= %{version}
@@ -82,7 +84,7 @@ Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE applications
 
 # Some applications are disabled for now ...
-# Compiz-related stuff
+# Compiz-related stuff does not work (obsolete)
 #Requires: trinity-compizconfig-backend-kconfig
 #Requires: trinity-desktop-effects-kde
 #Requires: trinity-fusion-icon
@@ -101,7 +103,7 @@ Summary:	Meta-package to install all TDE applications
 #Requires: trinity-qt4-tqt-theme-engine
 
 # Warning, k9copy requires ffmpeg
-# Warning, kradio requires libmp3lame
+# Warning, tderadio requires libmp3lame
 Requires: trinity-abakus
 Requires: trinity-amarok
 Requires: trinity-basket
@@ -112,34 +114,18 @@ Requires: trinity-filelight
 Requires: trinity-gwenview
 Requires: trinity-gwenview-i18n
 Requires: trinity-k3b
-Requires: trinity-k9copy
-Requires: trinity-kaffeine
-Requires: trinity-kaffeine-mozilla
 Requires: trinity-katapult
 Requires: trinity-kbarcode
 Requires: trinity-kbfx
 Requires: trinity-kbookreader
 Requires: trinity-kchmviewer
-Requires: trinity-kcmautostart
 Requires: trinity-kcpuload
-Requires: trinity-kdbusnotification
-Requires: trinity-guidance
-Requires: trinity-guidance-powermanager
-Requires: trinity-style-lipstik
-Requires: trinity-style-qtcurve
-Requires: trinity-systemsettings
-Requires: trinity-kdesudo
-Requires: trinity-kdesvn
+Requires: trinity-k9copy
 Requires: trinity-kdiff3
 Requires: trinity-kdirstat
-Requires: trinity-kdmtheme
 Requires: trinity-keep
 Requires: trinity-kile
-Requires: trinity-kima
-Requires: trinity-kio-locate
-Requires: trinity-kio-umountwrapper
 Requires: trinity-kiosktool
-Requires: trinity-kmplayer
 Requires: trinity-kmyfirewall
 Requires: trinity-kmymoney
 Requires: trinity-knemo
@@ -150,9 +136,7 @@ Requires: trinity-knowit
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
 Requires: trinity-konversation
-Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
-Requires: trinity-kradio
 Requires: trinity-krename
 Requires: trinity-krusader
 Requires: trinity-ksplash-engine-moodin
@@ -161,18 +145,31 @@ Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
 Requires: trinity-ktorrent
+Requires: trinity-kuickshow
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
-Requires: trinity-kwin-style-crystal
+Requires: trinity-twin-style-crystal
 Requires: trinity-piklab
 Requires: trinity-potracegui
-Requires: trinity-smartcardauth
 Requires: trinity-smb4k
+Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
+Requires: trinity-tde-guidance
+Requires: trinity-tde-guidance-powermanager
+Requires: trinity-tde-style-lipstik
+Requires: trinity-tde-style-qtcurve
+Requires: trinity-tde-systemsettings
+Requires: trinity-tdeio-apt
+Requires: trinity-tdeio-locate
+Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tderadio
+Requires: trinity-tdesudo
+Requires: trinity-tdmtheme
 Requires: trinity-tellico
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
+
 # Disabled applications for RHEL5
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 # On RHEL 5, HAL version is too old for kpowersave .
@@ -185,19 +182,13 @@ Requires: trinity-rosegarden
 Requires: trinity-kpilot
 %endif
 
-# This one causes several crashes .
+# This one causes several crashes . Obsolete.
 #Requires: trinity-kgtk-qt3
+Obsoletes: trinity-kgtk-qt3
 
-# Disabled applications for OPENSUSE 12.2, Mageia 2
-%if 0%{?rhel} || 0%{?fedora} >= 15
-# no imlib1.x library
-Requires: trinity-kuickshow
-%endif
-
+# OBSOLETE: beagle does not exist anymore. Kerry is now useless.
 # RHEL, openSUSE 12: no Beagle library
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-Requires: trinity-kerry
-%endif
+Obsoletes: trinity-kerry
 
 # RHEL 6 only: knetworkmanager8
 #  knetworkmanager9 is too unstable for now.
@@ -205,6 +196,21 @@ Requires: trinity-kerry
 Requires: trinity-knetworkmanager
 %endif
 
+# RHEL 4
+%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+# HAL is too old
+Requires: trinity-kima
+Requires: trinity-kaffeine
+Requires: trinity-kaffeine-mozilla
+Requires: trinity-kmplayer
+# No OTR support
+Requires: trinity-kopete-otr
+# No DBUS support
+Requires: trinity-kdbusnotification
+# Subversion 1.1 is too old
+Requires: trinity-tdesvn
+%endif
+
 %description applications
 %{summary}
 
@@ -219,9 +225,31 @@ Summary:	Meta-package to install all extras (unofficial) TDE packages
 Requires:	trinity-akode
 Requires:	trinity-kasablanca
 #Requires:	trinity-kdebluetooth
+#Requires:	trinity-kcheckgmail
+Requires:	trinity-icons-crystalsvg-updated
+Requires:	trinity-icons-kfaenza
+Requires:	trinity-icons-oxygen
+Requires:	trinity-kbibtex
+Requires:	trinity-kbiff
+Requires:	trinity-kcmautostart
+Requires:	trinity-kftpgrabber
 Requires:	trinity-kickoff-i18n
+Requires:	trinity-knmap
+#Requires:	trinity-knoda
 Requires:	trinity-ksensors
+Requires:	trinity-kshowmail
+Requires:	trinity-mplayerthumbs
 Requires:	trinity-style-ia-ora
+Requires:	trinity-tdeio-ftps-plugin
+#Requires:	trinity-tdeio-sysinfo-plugin
+Requires:	trinity-theme-baghira
+Requires:	trinity-tork
+
+
+# GLIBC too old on RHEL <= 5
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+Requires:	trinity-twinkle
+%endif
 
 %description extras
 %{summary}
@@ -254,10 +282,31 @@ Summary:	Yum configuration files for Trinity
 %description -n trinity-repo
 %{summary}
 
+%pre -n trinity-repo
+# Make sure every Trinity related repository is deleted before installing new one.
+%__rm -f %{_sysconfdir}/yum.repos.d/trinity-*.repo
+
 %files -n trinity-repo
+%defattr(-,root,root,-)
 %{_sysconfdir}/yum.repos.d/*.repo
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity
 %endif
 
+##########
+
+%if 0%{?pclinuxos}
+%package -n trinity-wallpaper-theme-default
+Group:		User Interface/Desktops
+Summary:	Default wallpaper for Trinity
+
+%description -n trinity-wallpaper-theme-default
+%{summary}
+
+%files -n trinity-wallpaper-theme-default
+%defattr(-,root,root,-)
+%{tde_datadir}/wallpapers/pclinuxos32.jpg
+%{tde_datadir}/wallpapers/pclinuxos64.jpg
+%endif
 
 ##########
 
@@ -267,31 +316,46 @@ Summary:	Yum configuration files for Trinity
 
 %install
 %__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}%{_sysconfdir}/yum.repos.d
+%__mkdir_p "%{?buildroot}%{_sysconfdir}/yum.repos.d"
 
-# Fedora repo file
-%if 0%{?fedora} > 0
+# FEDORA configuration for YUM
+%if 0%{?fedora}
 %__sed %{SOURCE0} \
   -e 's/\$releasever/%{fedora}/g' \
   -e 's/-fedora/-f%{fedora}/g' \
-  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo
+  >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
 %endif
 
-# RHEL repo file
+# RHEL configuration for YUM
 # $releasever is replaced with its value
-%if 0%{?rhel} > 0
+%if 0%{?rhel}
 %__sed %{SOURCE1} \
   -e 's/\$releasever/%{rhel}/g' \
-  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo
+  >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
 %endif
 
 %if 0%{?fedora} || 0%{?rhel}
 %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
 %endif
 
+# RPM signing key
+%if 0%{?rhel} || 0%{?fedora}
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity"
+%endif
+
+# PCLinuxOS wallpaper
+%if 0%{?pclinuxos} == 2013
+%__install -D -m 644 "%{SOURCE11}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos32.jpg"
+%__install -D -m 644 "%{SOURCE12}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos64.jpg"
+%endif
+
 %changelog
+* Mon Jun 03 2013 Francois Andriot <[email protected]> - 3.5.13.2-1
+- Update to version 3.5.13.2
+- Add GPG signing key
+
 * Mon Oct 01 2012 Francois Andriot <[email protected]> - 3.5.13.1-1
-- Update to major version 3.5.13.1
+- Update to version 3.5.13.1
 
 * Mon Aug 06 2012 Francois Andriot <[email protected]> - 3.5.13-6
 - Add 'applications' subpackage
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 66b495c48..e66cc7219 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -3,7 +3,7 @@
 %define tde_bindir %{tde_prefix}/bin
 
 Name:		trinity-live
-Version:	3.5.13.1
+Version:	3.5.13.2
 Release:	1%{?dist}
 License:	GPL
 Summary:	Trinity Spins