RHEL/Fedora: some updates

10 files changed, 1857 insertions, 625 deletions

diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
index 1b30facbd..35d709546 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -5,15 +5,15 @@
 %endif
 
 # TDE 3.5.13 specific building variables
+%define tde_appdir %{_datadir}/applications/kde
 %define tde_docdir %{_docdir}/kde
 %define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
-
-Name:		trinity-kdeaddons
+Name:		trinity-tdeaddons
 Summary:	Trinity Desktop Environment - Plugins
 Version:	3.5.13
-Release:	4%{?dist}%{?_variant}
+Release:	5%{?dist}%{?_variant}
 
 License:	GPLv2
 Group:		User Interface/Desktops
@@ -22,6 +22,11 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
+Obsoletes:	trinity-kdeaddons < %{version}-%{release}
+Provides:	trinity-kdeaddons = %{version}-%{release}
+Obsoletes:	trinity-kdeaddons-extras < %{version}-%{release}
+Provides:	trinity-kdeaddons-extras = %{version}-%{release}
+
 Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,7 @@ BuildRequires: trinity-kdebase-devel
 BuildRequires: trinity-kdegames-devel
 BuildRequires: trinity-kdemultimedia-devel
 BuildRequires: trinity-kdepim-devel
+
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: openssl-devel
@@ -41,36 +47,583 @@ BuildRequires: db4-devel
 
 %if 0%{?fedora}
 BuildRequires: xmms-devel
-Obsoletes: %{name}-xmms < %{version}-%{release}
-# used in jpegorient (#312641)
-Requires: python-exif
 %endif
 
-Requires: trinity-kdebase
-Requires: which
+#Requires: which
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires: trinity-atlantikdesigner = %{version}-%{release}
+Requires: trinity-kaddressbook-plugins = %{version}-%{release}
+Requires: trinity-kate-plugins = %{version}-%{release}
+Requires: trinity-tdeaddons-kfile-plugins = %{version}-%{release}
+Requires: trinity-kicker-applets = %{version}-%{release}
+Requires: trinity-knewsticker-scripts = %{version}-%{release}
+Requires: trinity-konq-plugins = %{version}-%{release}
+Requires: trinity-ksig = %{version}-%{release}
+Requires: trinity-noatun-plugins = %{version}-%{release}
 
 
 %description
 A collection of TDE Addons/Plugins, including: 
+* atlantikdesigner: game board designer
 * konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver
 * kate (plugins) 
 * kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol
 * knewsticker-scripts
-
-%package extras
-Group: User Interface/Desktops
-Summary: Extras packages from kdeaddons
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-kdegames
-Obsoletes: %{name}-atlantikdesigner < %{version}-%{release}
-%description extras
-This package includes:
-* atlantikdesigner: game board designer
 * noatun-plugins
 
+%files
+%defattr(-,root,root,-)
+%doc README
+%doc rpmdocs/*
+
+##########
+
+%package -n trinity-atlantikdesigner
+Summary:	Game board designer for Atlantik
+Group:		Applications/Games
+#Requires:	trinity-atlantik
+Requires:	trinity-kdegames
+
+%description -n trinity-atlantikdesigner
+Atlantik Designer is a game board designer for the game Atlantik.
+
+Atlantik is a TDE client for playing Monopoly-like board games on the
+monopd network.  It can play any board supported by the network
+server, including the classic Monopoly game as well as the Atlantik
+game in which the properties include several major cities in North
+America and Europe.
+
+%files -n trinity-atlantikdesigner
+%defattr(-,root,root,-)
+%doc atlantikdesigner/TODO
+%{_bindir}/atlantikdesigner
+%{_datadir}/apps/atlantikdesigner
+%{tde_appdir}/atlantikdesigner.desktop
+%{_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
+
+%post -n trinity-atlantikdesigner
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-atlantikdesigner
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kaddressbook-plugins
+Summary:	Plugins for KAddressBook, the Trinity address book
+Group:		Applications/Utilities
+Requires:	trinity-kaddressbook
+
+%description -n trinity-kaddressbook-plugins
+This package contains a variety of useful plugins for the KDE address
+book.  These plugins can be loaded through the TDE address book settings.
+
+Highlights include exporting postal addresses as flags in KWorldClock,
+as well as importing and exporting contacts in the native format used
+by the German freemail provider GMX.
+
+%files -n trinity-kaddressbook-plugins
+%defattr(-,root,root,-)
+%{tde_libdir}/libkaddrbk_geo_xxport.la
+%{tde_libdir}/libkaddrbk_geo_xxport.so
+%{tde_libdir}/libkaddrbk_gmx_xxport.la
+%{tde_libdir}/libkaddrbk_gmx_xxport.so
+%{_datadir}/apps/kaddressbook
+%{_datadir}/services/kaddressbook
+
+##########
+
+%package -n trinity-kate-plugins
+Summary:	Plugins for Kate, the TDE Advanced Text Editor
+Group:		Applications/Utilities
+Requires:	trinity-kate
+Requires:	tidy
+
+%description -n trinity-kate-plugins
+This package contains a variety of useful plugins for Kate, the KDE
+Advanced Text Editor.  These plugins can be loaded through the plugin
+manager in Kate settings.
+
+Highlights include spell checking, text filtering, HTML/XML construction
+and validation, vim/emacs modeline handling, templates for new files
+and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
+a tab bar, a Python browser and even more.
+
+%files -n trinity-kate-plugins
+%defattr(-,root,root,-)
+%{tde_libdir}/katecppsymbolviewerplugin.la
+%{tde_libdir}/katecppsymbolviewerplugin.so
+%{tde_libdir}/katefiletemplates.la
+%{tde_libdir}/katefiletemplates.so
+%{tde_libdir}/katefll_plugin.la
+%{tde_libdir}/katefll_plugin.so
+%{tde_libdir}/katehelloworldplugin.la
+%{tde_libdir}/katehelloworldplugin.so
+%{tde_libdir}/katehtmltoolsplugin.la
+%{tde_libdir}/katehtmltoolsplugin.so
+%{tde_libdir}/kateinsertcommandplugin.la
+%{tde_libdir}/kateinsertcommandplugin.so
+%{tde_libdir}/katemakeplugin.la
+%{tde_libdir}/katemakeplugin.so
+%{tde_libdir}/katemodelineplugin.la
+%{tde_libdir}/katemodelineplugin.so
+%{tde_libdir}/kateopenheaderplugin.la
+%{tde_libdir}/kateopenheaderplugin.so
+%{tde_libdir}/katepybrowseplugin.la
+%{tde_libdir}/katepybrowseplugin.so
+%{tde_libdir}/katesnippetsplugin.la
+%{tde_libdir}/katesnippetsplugin.so
+%{tde_libdir}/katetextfilterplugin.la
+%{tde_libdir}/katetextfilterplugin.so
+%{tde_libdir}/katexmlcheckplugin.la
+%{tde_libdir}/katexmlcheckplugin.so
+%{tde_libdir}/katexmltoolsplugin.la
+%{tde_libdir}/katexmltoolsplugin.so
+%{tde_libdir}/libkatetabbarextensionplugin.la
+%{tde_libdir}/libkatetabbarextensionplugin.so
+%{_datadir}/applnk/.hidden/katefll.desktop
+%{_datadir}/apps/kate
+%{_datadir}/apps/katepart
+%{_datadir}/apps/katexmltools
+%{_datadir}/services/katecppsymbolviewer.desktop
+%{_datadir}/services/katefiletemplates.desktop
+%{_datadir}/services/katefll_plugin.desktop
+%{_datadir}/services/katehelloworld.desktop
+%{_datadir}/services/katehtmltools.desktop
+%{_datadir}/services/kateinsertcommand.desktop
+%{_datadir}/services/katemake.desktop
+%{_datadir}/services/katemodeline.desktop
+%{_datadir}/services/kateopenheader.desktop
+%{_datadir}/services/katepybrowse.desktop
+%{_datadir}/services/katesnippets.desktop
+%{_datadir}/services/katetabbarextension.desktop
+%{_datadir}/services/katetextfilter.desktop
+%{_datadir}/services/katexmlcheck.desktop
+%{_datadir}/services/katexmltools.desktop
+%{tde_docdir}/HTML/en/kate-plugins/
+
+##########
+
+%package kfile-plugins
+Summary:	Trinity file dialog plugins for text files and folders
+Group:		Applications/Utilities
+
+%description kfile-plugins
+This is a collection of plugins for the TDE file dialog.  These plugins
+extend the file dialog to offer advanced meta-information for text,
+HTML and desktop files, as well as for folders, Windows .lnk files,
+MIME archives and X.509 certificates.
+
+This package also includes plugins for the KDE file rename dialog,
+allowing a user to more easily decide what to do when faced with a
+decision regarding conflicting filenames.  Rename dialog plugins are
+provided for audio and image files.
+
+%files kfile-plugins
+%defattr(-,root,root,-)
+%{_bindir}/lnkforward
+%{tde_libdir}/kfile_cert.la
+%{tde_libdir}/kfile_cert.so
+%{tde_libdir}/kfile_desktop.la
+%{tde_libdir}/kfile_desktop.so
+%{tde_libdir}/kfile_folder.la
+%{tde_libdir}/kfile_folder.so
+%{tde_libdir}/kfile_html.la
+%{tde_libdir}/kfile_html.so
+%{tde_libdir}/kfile_lnk.la
+%{tde_libdir}/kfile_lnk.so
+%{tde_libdir}/kfile_mhtml.la
+%{tde_libdir}/kfile_mhtml.so
+%{tde_libdir}/kfile_txt.la
+%{tde_libdir}/kfile_txt.so
+%{tde_libdir}/librenaudioplugin.la
+%{tde_libdir}/librenaudioplugin.so
+%{tde_libdir}/librenimageplugin.la
+%{tde_libdir}/librenimageplugin.so
+%{_datadir}/applnk/.hidden/lnkforward.desktop
+%{_datadir}/mimelnk/application/x-win-lnk.desktop
+%{_datadir}/services/kfile_cert.desktop
+%{_datadir}/services/kfile_desktop.desktop
+%{_datadir}/services/kfile_folder.desktop
+%{_datadir}/services/kfile_html.desktop
+%{_datadir}/services/kfile_lnk.desktop
+%{_datadir}/services/kfile_mhtml.desktop
+%{_datadir}/services/kfile_txt.desktop
+%{_datadir}/services/renaudiodlg.desktop
+%{_datadir}/services/renimagedlg.desktop
+
+##########
+
+%package -n trinity-kicker-applets
+Summary:	Applets for Kicker, the Trinity panel
+Group:		Applications/Utilities
+Requires:	trinity-kicker
+
+%description -n trinity-kicker-applets
+This package contains a variety of applets for Kicker, the KDE panel.
+These applets will appear in the panel's Add--Applet menu.
+
+Included are a system monitor, a colour picker, a media player controller,
+a mathematical evaluator and a binary clock.
+
+The media control applet does not support XMMS, as this would force all
+kicker-applets users to install XMMS. If you want a kicker applet that
+controls XMMS, install the xmms-kde-trinity package.
+
+%files -n trinity-kicker-applets
+%defattr(-,root,root,-)
+%{tde_libdir}/kolourpicker_panelapplet.la
+%{tde_libdir}/kolourpicker_panelapplet.so
+%{tde_libdir}/ktimemon_panelapplet.la
+%{tde_libdir}/ktimemon_panelapplet.so
+%{tde_libdir}/math_panelapplet.la
+%{tde_libdir}/math_panelapplet.so
+%{tde_libdir}/mediacontrol_panelapplet.la
+%{tde_libdir}/mediacontrol_panelapplet.so
+%{tde_libdir}/kbinaryclock_panelapplet.la
+%{tde_libdir}/kbinaryclock_panelapplet.so
+%{_datadir}/apps/kicker/applets
+%{_datadir}/apps/mediacontrol
+%{_datadir}/config.kcfg/kbinaryclock.kcfg
+%{_datadir}/icons/locolor/*/apps/ktimemon.png
+%{_datadir}/icons/crystalsvg/*/apps/ktimemon.png
+%{tde_docdir}/HTML/en/kicker-applets/
+
+%post -n trinity-kicker-applets
+for f in crystalsvg locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+
+%postun -n trinity-kicker-applets
+for f in crystalsvg locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+
+##########
+
+%package -n trinity-knewsticker-scripts
+Summary: scripts for KNewsTicker, the Trinity news ticker
+Group:		Applications/Utilities
+Requires:	perl
+Requires:	python
+#Requires:	libfinance-quote-perl
+#Requires:	libmime-perl
+#Requires:	libnews-nntpclient-perl
+Requires:	perl-libwww-perl
+Requires:	trinity-knewsticker
+
+%description -n trinity-knewsticker-scripts
+This package contains a variety of scripts that provide additional news
+sources for KNewsTicker, the news ticker applet for the TDE panel.
+
+Highlights include newsgroup handling, stock data retrieval, sports scores
+and various local news sources.
+
+%files -n trinity-knewsticker-scripts
+%defattr(-,root,root,-)
+%{_datadir}/apps/knewsticker/
+
+##########
+
+%package -n trinity-konq-plugins
+Summary:	plugins for Konqueror, the Trinity file/web/doc browser
+Group:		Applications/Utilities
+Requires:	libjpeg
+Requires:	python
+Requires:	rsync
+#Requires:	unison
+Requires:	trinity-konqueror
+%if 0%{?fedora} > 0
+Requires:	python-exif
+%endif
+
+%description -n trinity-konq-plugins
+This package contains a variety of useful plugins for Konqueror, the
+file manager, web browser and document viewer for KDE.  Many of these
+plugins will appear in Konqueror's Tools menu.
+
+Highlights for web browsing include web page translation, web page archiving,
+auto-refreshing, HTML and CSS structural analysis, a search toolbar, a
+sidebar news ticker, fast access to common options, bookmarklets, a crash
+monitor, a microformat availability indicator, a del.icio.us bookmarks
+sidebar, and integration with the aKregator RSS feed reader.
+
+Highlights for directory browsing include directory filters, image gallery
+creation, archive compression and extraction, quick copy/move, a sidebar
+media player, a file information metabar/sidebar, a media folder helper, a
+graphical disk usage viewer and image conversions and transformations.
+
+%files -n trinity-konq-plugins
+%defattr(-,root,root,-)
+%{_datadir}/config/translaterc
+%{_bindir}/fsview
+%{_bindir}/jpegorient
+%{_bindir}/kio_media_realfolder
+%{tde_libdir}/konq_sidebarnews.la
+%{tde_libdir}/konq_sidebarnews.so
+%{tde_libdir}/konqsidebar_delicious.la
+%{tde_libdir}/konqsidebar_delicious.so
+%{tde_libdir}/konqsidebar_mediaplayer.la
+%{tde_libdir}/konqsidebar_mediaplayer.so
+%{tde_libdir}/konqsidebar_metabar.la
+%{tde_libdir}/konqsidebar_metabar.so
+%{tde_libdir}/libakregatorkonqfeedicon.la
+%{tde_libdir}/libakregatorkonqfeedicon.so
+%{tde_libdir}/libakregatorkonqplugin.la
+%{tde_libdir}/libakregatorkonqplugin.so
+%{tde_libdir}/libarkplugin.la
+%{tde_libdir}/libarkplugin.so
+%{tde_libdir}/libautorefresh.la
+%{tde_libdir}/libautorefresh.so
+%{tde_libdir}/libbabelfishplugin.la
+%{tde_libdir}/libbabelfishplugin.so
+%{tde_libdir}/libcrashesplugin.la
+%{tde_libdir}/libcrashesplugin.so
+%{tde_libdir}/libdirfilterplugin.la
+%{tde_libdir}/libdirfilterplugin.so
+%{tde_libdir}/librsyncplugin.la
+%{tde_libdir}/librsyncplugin.so
+%{tde_libdir}/libdomtreeviewerplugin.la
+%{tde_libdir}/libdomtreeviewerplugin.so
+%{tde_libdir}/libfsviewpart.la
+%{tde_libdir}/libfsviewpart.so
+%{tde_libdir}/libkhtmlsettingsplugin.la
+%{tde_libdir}/libkhtmlsettingsplugin.so
+%{tde_libdir}/kcm_kuick.la
+%{tde_libdir}/kcm_kuick.so
+%{tde_libdir}/libkimgallery.la
+%{tde_libdir}/libkimgallery.so
+%{tde_libdir}/libkuickplugin.la
+%{tde_libdir}/libkuickplugin.so
+%{tde_libdir}/libmfkonqmficon.la
+%{tde_libdir}/libmfkonqmficon.so
+%{tde_libdir}/libminitoolsplugin.la
+%{tde_libdir}/libminitoolsplugin.so
+%{tde_libdir}/librellinksplugin.la
+%{tde_libdir}/librellinksplugin.so
+%{tde_libdir}/libsearchbarplugin.la
+%{tde_libdir}/libsearchbarplugin.so
+%{tde_libdir}/libuachangerplugin.la
+%{tde_libdir}/libuachangerplugin.so
+%{tde_libdir}/libvalidatorsplugin.la
+%{tde_libdir}/libvalidatorsplugin.so
+%{tde_libdir}/libwebarchiverplugin.la
+%{tde_libdir}/libwebarchiverplugin.so
+%{tde_libdir}/webarchivethumbnail.la
+%{tde_libdir}/webarchivethumbnail.so
+%{_datadir}/applnk/.hidden/arkplugin.desktop
+%{_datadir}/applnk/.hidden/kcmkuick.desktop
+%{_datadir}/applnk/.hidden/kuickplugin.desktop
+%{_datadir}/applnk/.hidden/mediaplayerplugin.desktop
+%{_datadir}/applnk/.hidden/crashesplugin.desktop
+%{_datadir}/applnk/.hidden/dirfilterplugin.desktop
+%{_datadir}/applnk/.hidden/rsyncplugin.desktop
+%{_datadir}/applnk/.hidden/fsview.desktop
+%{_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop
+%{_datadir}/applnk/.hidden/kimgalleryplugin.desktop
+%{_datadir}/applnk/.hidden/plugin_babelfish.desktop
+%{_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
+%{_datadir}/applnk/.hidden/plugin_validators.desktop
+%{_datadir}/applnk/.hidden/plugin_webarchiver.desktop
+%{_datadir}/applnk/.hidden/uachangerplugin.desktop
+%{_datadir}/apps/akregator
+%{_datadir}/apps/domtreeviewer
+%{_datadir}/apps/fsview
+%{_datadir}/apps/imagerotation/orient.py*
+%{_datadir}/apps/imagerotation/exif.py*
+%{_datadir}/apps/khtml/kpartplugins
+%{_datadir}/apps/konqiconview
+%{_datadir}/apps/konqlistview
+%{_datadir}/apps/konqsidebartng
+%{_datadir}/apps/konqueror/icons
+%{_datadir}/apps/konqueror/kpartplugins
+%{_datadir}/apps/konqueror/servicemenus
+%{_datadir}/apps/metabar/iconsrc
+%{_datadir}/apps/metabar/themes/default/default.css
+%{_datadir}/apps/metabar/themes/default/layout.html
+%{_datadir}/apps/microformat/pics/microformat.png
+%{_datadir}/config.kcfg/konq_sidebarnews.kcfg
+%{_datadir}/icons/locolor/16x16/apps/autorefresh.png
+%{_datadir}/icons/crystalsvg/16x16/actions/babelfish.png
+%{_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png
+%{_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png
+%{_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png
+%{_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png
+%{_datadir}/icons/crystalsvg/16x16/actions/remotesync.png
+%{_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png
+%{_datadir}/icons/crystalsvg/16x16/actions/minitools.png
+%{_datadir}/icons/crystalsvg/16x16/actions/validators.png
+%{_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png
+%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
+%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
+%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png
+%{_datadir}/icons/crystalsvg/22x22/actions/babelfish.png
+%{_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png
+%{_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png
+%{_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png
+%{_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png
+%{_datadir}/icons/crystalsvg/22x22/actions/remotesync.png
+%{_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png
+%{_datadir}/icons/crystalsvg/22x22/actions/minitools.png
+%{_datadir}/icons/crystalsvg/22x22/actions/validators.png
+%{_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png
+%{_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
+%{_datadir}/icons/crystalsvg/32x32/actions/minitools.png
+%{_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
+%{_datadir}/icons/crystalsvg/48x48/actions/minitools.png
+%{_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
+%{_datadir}/icons/hicolor/16x16/apps/metabar.png
+%{_datadir}/icons/hicolor/22x22/apps/fsview.png
+%{_datadir}/icons/hicolor/32x32/apps/fsview.png
+%{_datadir}/icons/hicolor/32x32/apps/metabar.png
+%{_datadir}/icons/hicolor/48x48/apps/metabar.png
+%{_datadir}/icons/hicolor/64x64/apps/metabar.png
+%{_datadir}/icons/hicolor/scalable/apps/metabar.svgz
+%{_datadir}/icons/hicolor/128x128/apps/metabar.png
+%{_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
+%{_datadir}/services/akregator_konqplugin.desktop
+%{_datadir}/services/ark_plugin.desktop
+%{_datadir}/services/fsview_part.desktop
+%{_datadir}/services/kuick_plugin.desktop
+%{_datadir}/services/webarchivethumbnail.desktop
+%{tde_libdir}/libadblock.la
+%{tde_libdir}/libadblock.so
+%{tde_docdir}/HTML/en/konq-plugins/
+
+%if 0%{?fedora}
+%{_datadir}/apps/metabar/themes/fedora/
+%{_datadir}/config/metabarrc
+%endif
+
+%post -n trinity-konq-plugins
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+
+%postun -n trinity-konq-plugins
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+
+##########
+
+%package -n trinity-ksig
+Summary:	Graphical tool for managing multiple email signatures
+Group:		Applications/Utilities
+Requires:	trinity-kmail
+
+%description -n trinity-ksig
+KSig is a graphical tool for keeping track of many different email
+signatures.  The signatures themselves can be edited through KSig's
+graphical user interface.  A command-line interface is then available
+for generating random or daily signatures from this list.
+
+The command-line interface makes a suitable plugin for generating
+signatures in external mail clients such as KMail.
+
+%files -n trinity-ksig
+%defattr(-,root,root,-)
+%{_bindir}/ksig
+%{tde_appdir}/ksig.desktop
+%{_datadir}/apps/ksig/ksigui.rc
+%{_datadir}/icons/hicolor/*/apps/ksig.png
+%{tde_docdir}/HTML/en/ksig/
+
+%post -n trinity-ksig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-noatun-plugins
+Summary:	plugins for Noatun, the Trinity media player
+Group:		Applications/Utilities
+Requires:	trinity-noatun
+
+%description -n trinity-noatun-plugins
+This package contains a variety of useful plugins for Noatun, the audio and
+video media player for TDE.  These plugins can be loaded through the plugin
+manager in Noatun settings.
+
+Highlights include an alarm clock, guessing tags from filenames, adjustable
+playback speed, capture to wave file and displaying lyrics, plus a variety
+of user interfaces, playlists and visualisation plugins.
+
+%files -n trinity-noatun-plugins
+%defattr(-,root,root,-)
+%{_bindir}/noatunsynaescope.bin
+%{_bindir}/noatuntippecanoe.bin
+%{_bindir}/noatuntyler.bin
+%{tde_libdir}/noatunalsaplayer.la
+%{tde_libdir}/noatunalsaplayer.so
+%{tde_libdir}/noatunblurscope.la
+%{tde_libdir}/noatunblurscope.so
+%{tde_libdir}/noatuncharlatan.la
+%{tde_libdir}/noatuncharlatan.so
+%{tde_libdir}/noatundub.la
+%{tde_libdir}/noatundub.so
+%{tde_libdir}/noatun_ffrs.la
+%{tde_libdir}/noatun_ffrs.so
+%{tde_libdir}/noatunluckytag.la
+%{tde_libdir}/noatunluckytag.so
+%{tde_libdir}/noatunlyrics.la
+%{tde_libdir}/noatunlyrics.so
+%{tde_libdir}/noatunmadness.la
+%{tde_libdir}/noatunmadness.so
+%{tde_libdir}/noatun_oblique.la
+%{tde_libdir}/noatun_oblique.so
+%{tde_libdir}/noatunpitchablespeed.la
+%{tde_libdir}/noatunpitchablespeed.so
+%{tde_libdir}/noatunsynaescope.la
+%{tde_libdir}/noatunsynaescope.so
+%{tde_libdir}/noatuntippecanoe.la
+%{tde_libdir}/noatuntippecanoe.so
+%{tde_libdir}/noatuntyler.la
+%{tde_libdir}/noatuntyler.so
+%{tde_libdir}/noatunwakeup.la
+%{tde_libdir}/noatunwakeup.so
+%{tde_libdir}/noatunwavecapture.la
+%{tde_libdir}/noatunwavecapture.so
+%{_datadir}/apps/noatun/*
+%{_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
+
+%post -n trinity-noatun-plugins
+for f in crystalsvg ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+
+%postun -n trinity-noatun-plugins
+for f in crystalsvg ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+
+##########
+
+
 
 %prep
 %setup -q -a 1 -n kdeaddons
@@ -141,102 +694,19 @@ install -m644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/
 %endif
 
 
-%post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post extras
-touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun extras
-touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc README
-%doc rpmdocs/*
-%{_bindir}/*
-%{tde_libdir}/*
-%{_datadir}/applications/kde/*
-%{_datadir}/applnk/.hidden/*
-%{_datadir}/apps/akregator/pics/*
-%{_datadir}/apps/domtreeviewer/
-%{_datadir}/apps/fsview/
-%{_datadir}/apps/imagerotation/
-%{_datadir}/apps/kaddressbook/*
-%{_datadir}/apps/kate/*
-%{_datadir}/apps/katepart/syntax/*
-%{_datadir}/apps/katexmltools
-# own dir so we don't need to Requires: kdenetwork too
-%dir %{_datadir}/apps/knewsticker
-%{_datadir}/apps/knewsticker/*
-%{_datadir}/apps/khtml/kpartplugins/*
-%{_datadir}/apps/konq*view/kpartplugins/*
-%{_datadir}/apps/konqueror/icons/*/*/*/*
-%dir %{_datadir}/apps/konqueror/kpartplugins/
-%{_datadir}/apps/konqueror/kpartplugins/*
-%{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/konqsidebartng/*/*
-%{_datadir}/apps/mediacontrol/
-%{_datadir}/apps/metabar/
-%{_datadir}/apps/microformat/
-#%{_datadir}/apps/noatun/*
-%{_datadir}/apps/kicker/applets/*
-%{_datadir}/apps/ksig/
-%{_datadir}/config*/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/*/*
-%{_datadir}/service*/*
-
-# atlantikdesigner
-%exclude %{_bindir}/atlantikdesigner
-%exclude %{_datadir}/icons/hicolor/*/*/atlantikdesigner*
-%exclude %{_datadir}/applications/kde/atlantikdesigner.desktop
-
-# noatun-plugins
-%exclude %{_bindir}/noatun*
-%exclude %{tde_libdir}/noatun*
-%exclude %{_datadir}/apps/noatun/*
-
-
-%files extras
-%defattr(-,root,root,-)
-
-# atlantikdesigner
-%doc atlantikdesigner/TODO
-%{_bindir}/atlantikdesigner
-%{_datadir}/apps/atlantikdesigner/
-%{_datadir}/icons/hicolor/*/*/atlantikdesigner*
-%{_datadir}/applications/kde/atlantikdesigner.desktop
-
-# noatun-plugins
-%{_bindir}/noatun*
-%{tde_libdir}/noatun*
-%{_datadir}/apps/noatun/*
 
 
 %changelog
+* Fri Jun 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Split in several packages
+
 * Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Removes SDL patch for noatun
 
diff --git a/redhat/kdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch b/redhat/kdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
new file mode 100644
index 000000000..b34c98212
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
@@ -0,0 +1,49 @@
+commit 03e19305ec704b8749bb7564e16ed8d78a80d516
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1340675585 -0500
+
+    Update default konqueror maximum image preview size to 10MB.
+
+diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
+index cbe4d40..53c16f1 100644
+--- a/kcontrol/konq/previews.cpp
++++ b/kcontrol/konq/previews.cpp
+@@ -67,14 +67,14 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
+ 
+     setQuickHelp( i18n("<h1>Preview Options</h1> Here you can modify the behavior "
+                 "of Konqueror when it shows the files in a folder."
+-                "<h2>The list of protocols:</h2> check the protocols over which "
++                "<h2>The list of protocols:</h2> Check the protocols over which "
+                 "previews should be shown; uncheck those over which they should not. "
+                 "For instance, you might want to show previews over SMB if the local "
+                 "network is fast enough, but you might disable it for FTP if you often "
+                 "visit very slow FTP sites with large images."
+-                "<h2>Maximum File Size:</h2> select the maximum file size for which "
+-                "previews should be generated. For instance, if set to 1 MB (the default), "
+-                "no preview will be generated for files bigger than 1 MB, for speed reasons."));
++                "<h2>Maximum File Size:</h2> Select the maximum file size for which "
++                "previews should be generated. For instance, if set to 10 MB (the default), "
++                "no preview will be generated for files bigger than 10 MB, for speed reasons."));
+ 
+     // Listview containing checkboxes for all protocols that support listing
+     KListView *listView = new KListView( this, "listView" );
+@@ -152,8 +152,8 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
+     load();
+ }
+ 
+-// Default: 1 MB
+-#define DEFAULT_MAXSIZE (1024*1024)
++// Default: 10 MB
++#define DEFAULT_MAXSIZE (1024*1024*10)
+ 
+ void KPreviewOptions::load(bool useDefaults)
+ {
+@@ -171,7 +171,7 @@ void KPreviewOptions::load(bool useDefaults)
+         else
+           it.current()->setOn( group.readBoolEntry( protocol, false ) );
+     }
+-    // config key is in bytes (default value 1MB), numinput is in MB
++    // config key is in bytes (default value 10MB), numinput is in MB
+     m_maxSize->setValue( ((double)group.readNumEntry( "MaximumSize", DEFAULT_MAXSIZE )) / (1024*1024) );
+ 
+     m_boostSize->setChecked( group.readBoolEntry( "BoostSize", false /*default*/ ) );
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index 0f66a056d..c85b6acaa 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -17,18 +17,21 @@
 %endif
 
 
-Name:		tdebase
+Name:		trinity-tdebase
 Version:	3.5.13
-Release:	23%{?release}%{?dist}%{?_variant}
+Release:	24%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity Base Programs
 Group:		User Interface/Desktops
 
 Obsoletes:	trinity-kdebase < %{version}-%{release}
+Provides:	trinity-kdebase = %{version}-%{release}
 Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
 Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
 Provides:	trinity-kdebase-extras = %{version}-%{release}
+Obsoletes:	tdebase < %{version}-%{release}
+Provides:	tdebase = %{version}-%{release}
+
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -154,6 +157,9 @@ Patch58:	kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
 ## [tdebase] Fix fancy logout not allowing interaction with save dialogs [Bug #922]
 ##   Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or kdesktop_lock not previously loaded [Commit #d2f8fca9]
 Patch59:	kdebase-3.5.13-fix_fancy_logout.patch
+## [tdebase] Update default konqueror maximum image preview size to 10MB. [Commit #03e19305]
+Patch60:	kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
+
 
 ### FEDORA / RHEL distribution-specific settings ###
 
@@ -252,11 +258,11 @@ BuildRequires:	perl-Digest-MD5
 %endif
 
 # tdebase is a metapackage that installs all sub-packages
-Requires: tdebase-runtime-data-common = %{version}-%{release}
-Requires: tdebase-data = %{version}-%{release}
-Requires: tdebase-bin = %{version}-%{release}
-Requires: tdebase-kio-plugins = %{version}-%{release}
-Requires: tdebase-kio-pim-plugins = %{version}-%{release}
+Requires: %{name}-runtime-data-common = %{version}-%{release}
+Requires: %{name}-data = %{version}-%{release}
+Requires: %{name}-bin = %{version}-%{release}
+Requires: %{name}-kio-plugins = %{version}-%{release}
+Requires: %{name}-kio-pim-plugins = %{version}-%{release}
 Requires: trinity-kappfinder = %{version}-%{release}
 Requires: trinity-kate = %{version}-%{release}
 Requires: trinity-kwrite = %{version}-%{release}
@@ -282,7 +288,7 @@ Requires: trinity-ksysguardd = %{version}-%{release}
 Requires: trinity-ktip = %{version}-%{release}
 Requires: trinity-twin = %{version}-%{release}
 Requires: trinity-libkonq = %{version}-%{release}
-Requires: tdebase-libtqt3-integration = %{version}-%{release}
+Requires: %{name}-libtqt3-integration = %{version}-%{release}
  
 Requires:	tqtinterface
 Requires:	trinity-arts
@@ -319,8 +325,7 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-kdelibs-devel
 
-Requires:	tdebase-bin-devel = %{version}-%{release}
-Requires:	tdebase-cmake = %{version}-%{release}
+Requires:	%{name}-bin-devel = %{version}-%{release}
 Requires:	trinity-kate-devel = %{version}-%{release}
 Requires:	trinity-kcontrol-devel = %{version}-%{release}
 Requires:	trinity-kdesktop-devel = %{version}-%{release}
@@ -334,6 +339,11 @@ Requires:	trinity-twin-devel = %{version}-%{release}
 
 Provides:	trinity-kdebase-devel = %{version}-%{release}
 Obsoletes:	trinity-kdebase-devel < %{version}-%{release}
+Provides:	tdebase-devel = %{version}-%{release}
+Obsoletes:	tdebase-devel < %{version}-%{release}
+
+Obsoletes:	trinity-kdebase-cmake < %{version}-%{release}
+Obsoletes:	tdebase-cmake < %{version}-%{release}
 
 %description devel
 This is a meta-package that installs all tdebase development packages.
@@ -343,19 +353,6 @@ Install tdebase-devel if you want to develop or compile Konqueror,
 Kate plugins or KWin styles.
 
 %files devel
-
-##########
-
-%package cmake
-Summary:	CMAKE macros for tdebase
-Group:		Development/Libraries
-Requires:	cmake
-
-%description cmake
-%{summary}
-
-%files cmake
-%defattr(-,root,root,-)
 %{_datadir}/cmake/*.cmake
 
 ##########
@@ -363,8 +360,11 @@ Requires:	cmake
 %package kio-pim-plugins
 Summary:	PIM KIOslaves from %{name}
 Group:		Environment/Libraries
+
 Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
 Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
+Provides:	tdebase-kio-pim-plugins = %{version}-%{release}
+Obsoletes:	tdebase-kio-pim-plugins < %{version}-%{release}
 
 %description kio-pim-plugins
 Protocol handlers (KIOslaves) for personal information management, including:
@@ -398,6 +398,9 @@ Protocol handlers (KIOslaves) for personal information management, including:
 Summary:	Shared common files for Trinity and KDE4
 Group:		Environment/Libraries
 
+Provides:	tdebase-runtime-data-common = %{version}-%{release}
+Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
+
 %description runtime-data-common
 Shared common files for both Trinity and KDE4
 Such as the desktop right-click-"Create New" list
@@ -435,7 +438,7 @@ done
 %package -n trinity-kappfinder
 Summary:	non-KDE application finder for KDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kappfinder
 kappfinder searches your workstation for many common applications and
@@ -480,7 +483,7 @@ Group:		Environment/Libraries
 %package -n trinity-kate
 Summary:	advanced text editor for TDE
 Group:		Applications/Text
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-kwrite = %{version}-%{release}
 Requires:	trinity-libkateinterfaces = %{version}-%{release}
 
@@ -564,7 +567,7 @@ Requires:	trinity-kate = %{version}-%{release}
 %package -n trinity-kwrite
 Summary:	advanced text editor for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-libkateinterfaces = %{version}-%{release}
 
 %description -n trinity-kwrite
@@ -603,7 +606,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 %package -n trinity-kcontrol
 Summary:	control center for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	hwdata
 Requires:	usbutils
 
@@ -902,9 +905,12 @@ Requires:	trinity-kcontrol = %{version}-%{release}
 %package bin
 Summary:	core binaries for the TDE base module
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
 
+Provides:	tdebase-bin = %{version}-%{release}
+Obsoletes:	tdebase-bin < %{version}-%{release}
+
 %description bin
 This package contains miscellaneous programs needed by other
 TDE applications, particularly those in the TDE base module.
@@ -1003,6 +1009,9 @@ Summary:	Development files for core binaries for the TDE base module
 Group:		Development/Libraries
 Requires:	%{name}-bin = %{version}-%{release}
 
+Obsoletes:	tdebase-bin-devel < %{version}-%{release}
+Provides:	tdebase-bin-devel = %{version}-%{release}
+
 %description bin-devel
 %{summary}
 
@@ -1021,7 +1030,10 @@ Requires:	%{name}-bin = %{version}-%{release}
 %package data
 Summary:	shared data files for the TDE base module
 Group:		Environment/Libraries
-Requires:	tdebase-runtime-data-common = %{version}-%{release}
+Requires:	%{name}-runtime-data-common = %{version}-%{release}
+
+Obsoletes:	tdebase-data < %{version}-%{release}
+Provides:	tdebase-data = %{version}-%{release}
 
 %description data
 This package contains the architecture-independent shared data files
@@ -1321,6 +1333,9 @@ Requires:	cyrus-sasl
 Requires:	psmisc
 Requires:	cryptsetup-luks
 
+Obsoletes:	tdebase-kio-plugins < %{version}-%{release}
+Provides:	tdebase-kio-plugins = %{version}-%{release}
+
 %description kio-plugins
 This package includes the base kioslaves. They include, amongst many
 others, file, http, and ftp.
@@ -1512,7 +1527,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 %package -n trinity-tdeprint
 Summary:	print system for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	psutils
 
 %description -n trinity-tdeprint
@@ -1581,8 +1596,8 @@ done
 %package -n trinity-kdesktop
 Summary:	miscellaneous binaries and files for the TDE desktop
 Group:		Applications/Utilities
-Requires:	tdebase-bin = %{version}-%{release}
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-bin = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-libkonq = %{version}-%{release}
 Requires:	eject
 Requires:	xdg-utils
@@ -1647,8 +1662,8 @@ Requires:	trinity-kdesktop = %{version}-%{release}
 %package -n trinity-tdm
 Summary:	X Display manager for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-bin = %{version}-%{release}
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-bin = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
 
 # Provides the global Xsession script (/etc/X11/xinit/Xsession)
@@ -1718,7 +1733,7 @@ Requires:	trinity-tdm = %{version}-%{release}
 %package -n trinity-kfind
 Summary:	file-find utility for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kfind
 kfind can be used to find files and directories on your
@@ -1755,7 +1770,7 @@ done
 %package -n trinity-khelpcenter
 Summary:	help center for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	htdig
 
 %description -n trinity-khelpcenter
@@ -1806,7 +1821,7 @@ done
 %package -n trinity-kicker
 Summary:	desktop panel for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kicker
 Kicker provides the TDE panel on you desktop. It can be used as a
@@ -1966,7 +1981,7 @@ Requires:	trinity-kicker = %{version}-%{release}
 %package -n trinity-klipper
 Summary:	clipboard utility for Trinity
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-klipper
 klipper provides standard clipboard functions (cut and paste, history
@@ -2015,7 +2030,7 @@ done
 %package -n trinity-kmenuedit
 Summary:	menu editor for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kmenuedit
 The TDE menu editor allows you to make customisations to the KDE menu
@@ -2052,9 +2067,9 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 %package -n trinity-konqueror
 Summary:	TDE's advanced file manager, web browser and document viewer
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-kcontrol = %{version}-%{release}
-Requires:	tdebase-kio-plugins = %{version}-%{release}
+Requires:	%{name}-kio-plugins = %{version}-%{release}
 Requires:	trinity-kdesktop = %{version}-%{release}
 Requires:	trinity-kfind = %{version}-%{release}
 Requires:	trinity-konqueror-nsplugins = %{version}-%{release}
@@ -2248,7 +2263,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 %package -n trinity-konsole
 Summary:	X terminal emulator for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-konsole
 Konsole is an X terminal emulation which provides a command-line interface
@@ -2316,7 +2331,7 @@ done
 %package -n trinity-kpager
 Summary:	desktop pager for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kpager
 This package contains TDE's desktop pager, which displays your virtual
@@ -2350,7 +2365,7 @@ done
 %package -n trinity-kpersonalizer
 Summary:	installation personalizer for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kpersonalizer
 TDE Personalizer is the application that configures the TDE desktop for you.
@@ -2385,7 +2400,7 @@ done
 %package -n trinity-ksmserver
 Summary:	session manager for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-twin = %{version}-%{release}
 
 %description -n trinity-ksmserver
@@ -2421,7 +2436,7 @@ KDE will start, but many good defaults will not be set.
 %package -n trinity-ksplash
 Summary:	the TDE splash screen
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-ksplash
 This package includes the TDE Splash screen, which is seen when
@@ -2486,7 +2501,7 @@ Requires:	trinity-ksplash = %{version}-%{release}
 %package -n trinity-ksysguard
 Summary:	system guard for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-ksysguardd = %{version}-%{release}
 
 %description -n trinity-ksysguard
@@ -2549,7 +2564,7 @@ Requires:	trinity-ksysguard = %{version}-%{release}
 %package -n trinity-ksysguardd
 Summary:	system guard daemon for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-ksysguardd
 TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
@@ -2570,7 +2585,7 @@ to monitor it through the daemon running there.
 %package -n trinity-ktip
 Summary:	useful tips for TDE
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-ktip
 ktip provides many useful tips on using KDE when you log in.
@@ -2604,7 +2619,7 @@ done
 %package -n trinity-twin
 Summary:	the TDE window manager
 Group:		Applications/Utilities
-Requires:	tdebase-data = %{version}-%{release}
+Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-twin
 This package contains the default X window manager for KDE.
@@ -2736,6 +2751,9 @@ Konqueror and the kdesktop package.
 Summary:	Integration library between TQt3 and TDE
 Group:		Environment/Libraries
 
+Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
+Provides:	tdebase-libtqt3-integration = %{version}-%{release}
+
 %description libtqt3-integration
 These libraries allow you to use TDE dialogs in native TQt3 applications.
 
@@ -2838,6 +2856,7 @@ Konqueror libraries.
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -2969,7 +2988,12 @@ cd build
 
 
 %changelog
+* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-24
+- Renames 'tdebase' to 'trinity-tdebase'
+- Update default konqueror maximum image preview size to 10MB. [Commit #03e19305]
+
 * Sun Jun 17 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-23
+- Renames 'trinity-kdebase' to 'tdebase'
 - Split into several packages
 
 * Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-22
diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch
new file mode 100644
index 000000000..0e9ec5b62
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch
@@ -0,0 +1,20 @@
+commit 0536f0b707bf86636096c962e9bb32adf3bb8112
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1341041394 -0500
+
+    Export kdemain symbol in iso kioslave
+    This closes Bug 465
+
+diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp
+index 5865139..4bd128e 100644
+--- a/kioslave/iso/iso.cpp
++++ b/kioslave/iso/iso.cpp
+@@ -56,7 +56,7 @@ static const unsigned char zisofs_magic[8] = {
+ 
+ using namespace KIO;
+ 
+-extern "C" { int kdemain(int argc, char **argv); }
++extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
+ 
+ int kdemain( int argc, char **argv )
+ {
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index ac0a6bd58..85e6f5e05 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -8,19 +8,12 @@
 %define tde_docdir %{_docdir}/kde
 %define tde_libdir %{_libdir}/trinity
 
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
-%define _qt_suffix 3
-%endif
-
-
-Name:		tdelibs
+Name:		trinity-tdelibs
 Version:	3.5.13
-Release:	9%{?dist}%{?_variant}
+Release:	10%{?dist}%{?_variant}
 License:	GPL
 Summary:	TDE Libraries
-Group:		System Environment/Libraries
+Group:		Environment/Libraries
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -31,6 +24,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kdelibs-%{version}.tar.gz
 
+Obsoletes:	tdelibs < %{version}-%{release}
+Provides:	tdelibs = %{version}-%{release}
 Obsoletes:	trinity-kdelibs < %{version}-%{release}
 Provides:	trinity-kdelibs = %{version}-%{release}
 Obsoletes:	trinity-kdelibs-apidocs < %{version}-%{release}
@@ -74,14 +69,14 @@ Patch26:	kdelibs-3.5.13-fix_ktempfile_special_bits.patch
 Patch27:	kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch
 ## [tdelibs] Fix FTBFS - incomplete build kspell2 [Bug #657] [Commit #3e284fad]
 Patch28:	kdelibs-3.5.13-fix_build_kspell2.patch
-
+## [tdelibs] Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7]
+Patch29:	kdelibs-3.5.13-fix_iso_kioslave.patch
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	avahi-devel
-#BuildRequires:	lua-devel
 BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
 BuildRequires:	libutempter-devel
 BuildRequires:	bzip2-devel
@@ -89,7 +84,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	gcc-c++
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libidn-devel
-BuildRequires:	qt%{?_qt_suffix}-devel
+BuildRequires:	qt3-devel
 BuildRequires:	avahi-qt3-devel
 BuildRequires:	jasper-devel
 BuildRequires:	libtiff-devel
@@ -99,11 +94,15 @@ BuildRequires:	glib2-devel
 BuildRequires:	gamin-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXcomposite-devel
+BuildRequires:	aspell-devel
+BuildRequires:	hspell-devel
+# LUA support are not ready yet
+#BuildRequires:	lua-devel
 
 Requires:		tqtinterface
 Requires:		trinity-arts
 Requires:		avahi
-Requires:		qt%{?_qt_suffix}
+Requires:		qt3
 Requires:		avahi-qt3
 
 %description
@@ -236,6 +235,8 @@ Summary:	%{name} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
+Obsoletes:	tdelibs-devel < %{version}-%{release}
+Provides:	tdelibs-devel = %{version}-%{release}
 Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
 Provides:	trinity-kdelibs-devel = %{version}-%{release}
 
@@ -271,9 +272,6 @@ Group:		Development/Libraries
 Summary:	%{name} - API documentation
 Requires:	%{name} = %{version}-%{release}
 
-Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{version}-%{release}
-
 %description apidocs
 This package includes the TDE API documentation in HTML
 format for easy browsing
@@ -321,7 +319,7 @@ cd build
   -DWITH_ARTS=ON \
   -DWITH_ALSA=ON \
   -DWITH_LIBART=ON \
-  -DWITH_LIBIDN=OFF \
+  -DWITH_LIBIDN=ON \
   -DWITH_SSL=ON \
   -DWITH_CUPS=ON \
   -DWITH_LUA=OFF \
@@ -330,8 +328,8 @@ cd build
   -DWITH_OPENEXR=ON \
   -DWITH_UTEMPTER=ON \
   -DWITH_AVAHI=ON \
-  -DWITH_ASPELL=OFF \
-  -DWITH_HSPELL=OFF \
+  -DWITH_ASPELL=ON \
+  -DWITH_HSPELL=ON \
   -DWITH_PCRE=ON \
   -DWITH_INOTIFY=ON \
   -DWITH_GAMIN=ON \
@@ -367,8 +365,13 @@ EOF
 
 
 %changelog
+* Tue Jun 26 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
+- Renames to 'trinity-tdelibs'
+- Enable 'aspell', 'hspell' and 'libidn'
+- Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7]
+
 * Tue Jun 19 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
-- Renames to 'tdelib'
+- Renames to 'tdelibs'
 - Fix 'ld.so.conf' file
 - Fix konq filter in list view mode. [Commit #06b51484]
 - Fix tdesu internal pathing [Bug #766] [Commit #e131f10b]
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index 262776d5b..38a445109 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -5,27 +5,25 @@
 %endif
 
 # TDE 3.5.13 specific building variables
+%define tde_appdir %{_datadir}/applications/kde
 %define tde_docdir %{_docdir}
 %define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
-
-%define appdir %{_datadir}/applications/kde
-
 # former extras bits
 %define _with_akode --with-akode
 ## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
 #define _with_musicbrainz --with-musicbrainz
 %define _with_taglib --with-taglib
 
-%if 0%{?fedora}
+#%if 0%{?fedora}
 %define _with_xine --with-xine
-%endif
+#%endif
 
-Name:    trinity-kdemultimedia
+Name:    trinity-tdemultimedia
 Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
 Version: 3.5.13
-Release: 7%{?dist}%{?_variant}
+Release: 8%{?dist}%{?_variant}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -53,14 +51,22 @@ Patch10:	kdemultimedia-3.5.13-fix_mmx_detection.patch
 Patch21:	kdemultimedia-3.5.13-remove_more_applications.patch
 # [tdemultimedia] Fix linear alphabet string errors [Commit #fd6afacf]
 Patch22:	kdemultimedia-3.5.13-fix_linear_alphabet.patch
-# [tdemultimedia] Fix kmix not autostarting in the user's session. [Bug #503]
-Patch23:	kdemultimedia-3.5.13-fix_kmix_autostart.patch
 
-Requires: %{name}-libs = %{version}-%{release}
+Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
+Provides:	trinity-kdemultimedia = %{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-libs < %{version}-%{release}
+Provides:	trinity-kdemultimedia-libs = %{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-extras < %{version}-%{release}
+Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
+Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
+
 
 BuildRequires: cmake >= 2.8
+BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
 BuildRequires: trinity-kdelibs-devel
+BuildRequires: qt3-devel >= 3.3.8.d
 
 BuildRequires: zlib-devel
 BuildRequires: libvorbis-devel
@@ -78,57 +84,948 @@ BuildRequires: automake libtool
 %{?_with_xine:BuildRequires: xine-lib-devel}
 BuildRequires:	libXxf86dga-devel
 BuildRequires:	libXxf86vm-devel
+BuildRequires:	libXt-devel
+
+Requires: trinity-artsbuilder = %{version}-%{release}
+Requires: trinity-juk = %{version}-%{release}
+Requires: trinity-kaboodle = %{version}-%{release}
+Requires: trinity-kaudiocreator = %{version}-%{release}
+Requires: %{name}-kfile-plugins = %{version}-%{release}
+Requires: %{name}-kappfinder-data = %{version}-%{release}
+Requires: %{name}-kio-plugins = %{version}-%{release}
+Requires: trinity-kmid = %{version}-%{release}
+Requires: trinity-kmix = %{version}-%{release}
+Requires: trinity-krec = %{version}-%{release}
+Requires: trinity-kscd = %{version}-%{release}
+Requires: trinity-libarts-akode = %{version}-%{release}
+Requires: trinity-libarts-audiofile = %{version}-%{release}
+Requires: trinity-libarts-mpeglib = %{version}-%{release}
+Requires: trinity-libarts-xine = %{version}-%{release}
+Requires: trinity-libkcddb = %{version}-%{release}
+Requires: trinity-mpeglib = %{version}-%{release}
+Requires: trinity-noatun = %{version}-%{release}
+
 
 %description
-The K Desktop Environment (KDE) is a GUI desktop for the X Window
+The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window
 System. The %{name} package contains multimedia applications for
-KDE, including:
+TDE, including:
+  artsbuilder, Synthesizer designer for aRts
+  juk, a media player
   kmid, a midi player
   kmix, an audio mixer
   arts, additional functionality for the aRts sound system
   krec, a recording tool
   kscd, an Audio-CD player
   kaudiocreator, a graphical frontend for audio file creation 
+  kaboodle, a media player
+  noatun, a media player
+
+%files
+
+##########
+
+%package -n trinity-artsbuilder
+Summary:	Synthesizer designer for aRts
+Group:		Applications/Multimedia
+
+%description -n trinity-artsbuilder
+This is the analog Realtime synthesizer's graphical design tool.
+
+%files -n trinity-artsbuilder
+%{_bindir}/artsbuilder
+%{_bindir}/artscontrol
+%{_bindir}/midisend
+%{_libdir}/libartsbuilder.la
+%{_libdir}/libartsbuilder.so.*
+%{_libdir}/libartscontrolapplet.la
+%{_libdir}/libartscontrolapplet.so.*
+%{_libdir}/libartscontrolsupport.la
+%{_libdir}/libartscontrolsupport.so.*
+%{_libdir}/libartsgui_idl.la
+%{_libdir}/libartsgui_idl.so.*
+%{_libdir}/libartsgui_kde.la
+%{_libdir}/libartsgui_kde.so.*
+%{_libdir}/libartsgui.la
+%{_libdir}/libartsgui.so.*
+%{_libdir}/libartsmidi_idl.la
+%{_libdir}/libartsmidi_idl.so.*
+%{_libdir}/libartsmidi.la
+%{_libdir}/libartsmidi.so.*
+%{_libdir}/libartsmodulescommon.la
+%{_libdir}/libartsmodulescommon.so.*
+%{_libdir}/libartsmoduleseffects.la
+%{_libdir}/libartsmoduleseffects.so.*
+%{_libdir}/libartsmodulesmixers.la
+%{_libdir}/libartsmodulesmixers.so.*
+%{_libdir}/libartsmodules.la
+%{_libdir}/libartsmodules.so.*
+%{_libdir}/libartsmodulessynth.la
+%{_libdir}/libartsmodulessynth.so.*
+%{_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
+%{_libdir}/mcop/artsbuilder.mcopclass
+%{_libdir}/mcop/artsbuilder.mcoptype
+%{_libdir}/mcop/Arts/Button.mcopclass
+%{_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
+%{_libdir}/mcop/Arts/Environment/Container.mcopclass
+%{_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
+%{_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
+%{_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
+%{_libdir}/mcop/Arts/Fader.mcopclass
+%{_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
+%{_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/GraphLine.mcopclass
+%{_libdir}/mcop/artsgui.mcopclass
+%{_libdir}/mcop/artsgui.mcoptype
+%{_libdir}/mcop/Arts/HBox.mcopclass
+%{_libdir}/mcop/Arts/Label.mcopclass
+%{_libdir}/mcop/Arts/LayoutBox.mcopclass
+%{_libdir}/mcop/Arts/LevelMeter.mcopclass
+%{_libdir}/mcop/Arts/LineEdit.mcopclass
+%{_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
+%{_libdir}/mcop/Arts/LocalFactory.mcopclass
+%{_libdir}/mcop/Arts/MidiManager.mcopclass
+%{_libdir}/mcop/artsmidi.mcopclass
+%{_libdir}/mcop/artsmidi.mcoptype
+%{_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
+%{_libdir}/mcop/artsmodulescommon.mcopclass
+%{_libdir}/mcop/artsmodulescommon.mcoptype
+%{_libdir}/mcop/artsmoduleseffects.mcopclass
+%{_libdir}/mcop/artsmoduleseffects.mcoptype
+%{_libdir}/mcop/artsmodules.mcopclass
+%{_libdir}/mcop/artsmodules.mcoptype
+%{_libdir}/mcop/artsmodulesmixers.mcopclass
+%{_libdir}/mcop/artsmodulesmixers.mcoptype
+%{_libdir}/mcop/artsmodulessynth.mcopclass
+%{_libdir}/mcop/artsmodulessynth.mcoptype
+%{_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
+%{_libdir}/mcop/Arts/MonoToStereo.mcopclass
+%{_libdir}/mcop/Arts/PopupBox.mcopclass
+%{_libdir}/mcop/Arts/Poti.mcopclass
+%{_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
+%{_libdir}/mcop/Arts/SpinBox.mcopclass
+%{_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/StereoBalance.mcopclass
+%{_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/StereoToMono.mcopclass
+%{_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
+%{_libdir}/mcop/Arts/StructureBuilder.mcopclass
+%{_libdir}/mcop/Arts/StructureDesc.mcopclass
+%{_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
+%{_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
+%{_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
+%{_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
+%{_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
+%{_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
+%{_libdir}/mcop/Arts/Synth_DATA.mcopclass
+%{_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
+%{_libdir}/mcop/Arts/Synth_DELAY.mcopclass
+%{_libdir}/mcop/Arts/Synth_DIV.mcopclass
+%{_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+%{_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
+%{_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
+%{_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
+%{_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
+%{_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
+%{_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
+%{_libdir}/mcop/Arts/Synth_NIL.mcopclass
+%{_libdir}/mcop/Arts/Synth_NOISE.mcopclass
+%{_libdir}/mcop/Arts/Synth_OSC.mcopclass
+%{_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
+%{_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
+%{_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
+%{_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
+%{_libdir}/mcop/Arts/Synth_RC.mcopclass
+%{_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
+%{_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
+%{_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+%{_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
+%{_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
+%{_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
+%{_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
+%{_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
+%{_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
+%{_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
+%{_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
+%{_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
+%{_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
+%{_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
+%{_libdir}/mcop/Arts/Synth_XFADE.mcopclass
+%{_libdir}/mcop/Arts/VBox.mcopclass
+%{_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
+%{_libdir}/mcop/Arts/Widget.mcopclass
+%{tde_appdir}/artsbuilder.desktop
+%{tde_appdir}/artscontrol.desktop
+%{_datadir}/apps/artsbuilder/
+%{_datadir}/apps/artscontrol/
+%{_datadir}/apps/kicker/applets/artscontrolapplet.desktop
+%{_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
+%{_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
+%{_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
+%{_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
+%{_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
+%{_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
+%{_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
+%{_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
+%{_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
+%{_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
+%{_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
+%{_datadir}/icons/hicolor/*/apps/artsbuilder.png
+%{_datadir}/icons/hicolor/*/apps/artscontrol.png
+%{_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
+%{_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
+%{_datadir}/mimelnk/application/x-artsbuilder.desktop
+%{tde_docdir}/HTML/en/artsbuilder/
+
+%post -n trinity-artsbuilder
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-artsbuilder
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-juk
+Summary:	Music organizer and player for Trinity
+Group:		Applications/Multimedia
+
+%description -n trinity-juk
+JuK (pronounced "jook") is a jukebox and music manager for the TDE
+desktop similar to jukebox software on other platforms such as
+iTunes or RealOne.
+
+Some of JuK's features include:
+* Support for Ogg Vorbis and MP3 formats
+* Tag editing support for both formats, including ID3v2 for MP3 files.
+  Multitagging or editing a selection of multiple files at once is also
+  supported
+* Output to either the aRts, default KDE sound system, or GStreamer
+* Management of your "collection" and multiple playlists
+* Import and export to m3u playlists
+* Binary caching of audio meta-data and playlist information for faster
+  load times (starting with the second time you run JuK)
+* Integration into TDE that allows drag-and-drop and clipboard usage
+  with other TDE and X apps
+
+%files -n trinity-juk
+%{_bindir}/juk
+%{tde_appdir}/juk.desktop
+%{_datadir}/apps/juk/
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/actions/juk_dock.png
+%{_datadir}/icons/hicolor/*/apps/juk.png
+%{tde_docdir}/HTML/en/juk/
+
+%post -n trinity-juk
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-juk
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kaboodle
+Summary:	light, embedded media player for Trinity
+Group:		Applications/Multimedia
+
+Requires:	trinity-libarts-xine = %{version}-%{release}
+
+%description -n trinity-kaboodle
+Kaboodle is a light, embedded media player, supporting both video and audio,
+for TDE. It uses the aRts framework for playing media files.
+
+%files -n trinity-kaboodle
+%{_bindir}/kaboodle
+%{tde_libdir}/libkaboodlepart.la
+%{tde_libdir}/libkaboodlepart.so
+%{tde_appdir}/kaboodle.desktop
+%{_datadir}/apps/kaboodle/
+%{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%{_datadir}/services/kaboodle_component.desktop
+%{_datadir}/services/kaboodleengine.desktop
+%{tde_docdir}/HTML/en/kaboodle/
+
+%post -n trinity-kaboodle
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kaboodle
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kaudiocreator
+Summary:	CD ripper and audio encoder frontend for Trinity
+Group:		Applications/Multimedia
+
+Requires:	%{name}-kio-plugins = %{version}-%{release}
+Requires:	vorbis-tools
+Requires:	flac
+
+%description -n trinity-kaudiocreator
+KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
+keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
+searches CDDB to retrieve the information of the disk.
+
+%files -n trinity-kaudiocreator
+%{_bindir}/kaudiocreator
+%{tde_appdir}/kaudiocreator.desktop
+%{_datadir}/apps/kaudiocreator/
+%{_datadir}/apps/kconf_update/kaudiocreator-libkcddb.upd
+%{_datadir}/apps/kconf_update/kaudiocreator-meta.upd
+%{_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
+%{_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
+%{_datadir}/config.kcfg/kaudiocreator.kcfg
+%{_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
+%{_datadir}/icons/hicolor/*/apps/kaudiocreator.png
+%{_datadir}/icons/locolor/*/apps/kaudiocreator.png
+%{tde_docdir}/HTML/en/kaudiocreator/
+
+%post -n trinity-kaudiocreator
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kaudiocreator
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package kfile-plugins
+Summary:	au/avi/m3u/mp3/ogg/wav plugins for kfile
+Group:		Applications/Multimedia
+
+%description kfile-plugins
+au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
+
+%files kfile-plugins
+%{tde_libdir}/kfile_au.la
+%{tde_libdir}/kfile_au.so
+%{tde_libdir}/kfile_avi.la
+%{tde_libdir}/kfile_avi.so
+%{tde_libdir}/kfile_flac.la
+%{tde_libdir}/kfile_flac.so
+%{tde_libdir}/kfile_m3u.la
+%{tde_libdir}/kfile_m3u.so
+%{tde_libdir}/kfile_mp3.la
+%{tde_libdir}/kfile_mp3.so
+%{tde_libdir}/kfile_mpc.la
+%{tde_libdir}/kfile_mpc.so
+%{tde_libdir}/kfile_mpeg.la
+%{tde_libdir}/kfile_mpeg.so
+%{tde_libdir}/kfile_ogg.la
+%{tde_libdir}/kfile_ogg.so
+%{tde_libdir}/kfile_sid.la
+%{tde_libdir}/kfile_sid.so
+%{tde_libdir}/kfile_theora.la
+%{tde_libdir}/kfile_theora.so
+%{tde_libdir}/kfile_wav.la
+%{tde_libdir}/kfile_wav.so
+%{_datadir}/services/kfile_au.desktop
+%{_datadir}/services/kfile_avi.desktop
+%{_datadir}/services/kfile_flac.desktop
+%{_datadir}/services/kfile_m3u.desktop
+%{_datadir}/services/kfile_mp3.desktop
+%{_datadir}/services/kfile_mpc.desktop
+%{_datadir}/services/kfile_mpeg.desktop
+%{_datadir}/services/kfile_ogg.desktop
+%{_datadir}/services/kfile_sid.desktop
+%{_datadir}/services/kfile_theora.desktop
+%{_datadir}/services/kfile_wav.desktop
+
+##########
+
+%package kappfinder-data
+Summary:	multimedia data for kappfinder-trinity
+Group:		Applications/Multimedia
+
+Requires: 	trinity-kappfinder
+
+%description kappfinder-data
+This package provides data on multimedia applications for kappfinder.
+
+%files kappfinder-data
+%{_datadir}/apps/kappfinder/*
+%{_datadir}/desktop-directories/[kt]de-multimedia-music.directory
+%{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
+
+##########
+
+%package kio-plugins
+Summary:	Enables the browsing of audio CDs under Konqueror
+Group:		Applications/Multimedia
+
+%description kio-plugins
+This package allow audio CDs to be browsed like a file system using
+Konqueror and the audiocd:/ URL.
+
+%files kio-plugins
+%{tde_libdir}/kcm_audiocd.la
+%{tde_libdir}/kcm_audiocd.so
+%{tde_libdir}/kio_audiocd.la
+%{tde_libdir}/kio_audiocd.so
+%{tde_libdir}/libaudiocd_encoder_flac.la
+%{tde_libdir}/libaudiocd_encoder_flac.so
+%{tde_libdir}/libaudiocd_encoder_lame.la
+%{tde_libdir}/libaudiocd_encoder_lame.so
+%{tde_libdir}/libaudiocd_encoder_vorbis.la
+%{tde_libdir}/libaudiocd_encoder_vorbis.so
+%{tde_libdir}/libaudiocd_encoder_wav.la
+%{tde_libdir}/libaudiocd_encoder_wav.so
+%{_libdir}/libaudiocdplugins.so.*
+%{tde_appdir}/audiocd.desktop
+%{_datadir}/apps/kconf_update/audiocd.upd
+%{_datadir}/apps/kconf_update/upgrade-metadata.sh
+%{_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
+%{_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
+%{_datadir}/services/audiocd.protocol
+%{tde_docdir}/HTML/en/kioslave/audiocd.docbook
+
+%post kio-plugins
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun kio-plugins
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kmid
+Summary:	MIDI/karaoke player for Trinity
+Group:		Applications/Multimedia
+
+%description -n trinity-kmid
+This package provides a MIDI and karaoke player for TDE.
+
+%files -n trinity-kmid
+%{_bindir}/kmid
+%{tde_libdir}/libkmidpart.la
+%{tde_libdir}/libkmidpart.so
+%{_libdir}/libkmidlib.so.*
+%{tde_appdir}/kmid.desktop
+%{_datadir}/apps/kmid/
+%{_datadir}/icons/hicolor/*/apps/kmid.png
+%{_datadir}/mimelnk/audio/x-karaoke.desktop
+%{_datadir}/servicetypes/audiomidi.desktop
+%{tde_docdir}/HTML/en/kmid/
+
+%post -n trinity-kmid
+/sbin/ldconfig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kmid
+/sbin/ldconfig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kmix
+Summary:	Sound mixer applet for Trinity
+Group:		Applications/Multimedia
+
+%description -n trinity-kmix
+This package includes TDE's dockable sound mixer applet.
+
+%files -n trinity-kmix
+%{_bindir}/kmix
+%{_bindir}/kmixctrl
+%{tde_libdir}/kmix.la
+%{tde_libdir}/kmix.so
+%{tde_libdir}/kmix_panelapplet.la
+%{tde_libdir}/kmix_panelapplet.so
+%{tde_libdir}/kmixctrl.la
+%{tde_libdir}/kmixctrl.so
+%{_libdir}/lib[kt]deinit_kmix.so
+%{_libdir}/lib[kt]deinit_kmixctrl.so
+%{tde_appdir}/kmix.desktop
+%{_datadir}/apps/kicker/applets/kmixapplet.desktop
+%{_datadir}/apps/kmix/
+%{_datadir}/autostart/restore_kmix_volumes.desktop
+%{_datadir}/icons/hicolor/*/apps/kmix.png
+%{_datadir}/services/kmixctrl_restore.desktop
+%{tde_docdir}/HTML/en/kmix/
+
+%post -n trinity-kmix
+/sbin/ldconfig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kmix
+/sbin/ldconfig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-krec
+Summary:	Sound recorder utility for Trinity
+Group:		Applications/Multimedia
+
+%description -n trinity-krec
+This is a sound recording utility for Trinity.
+
+%files -n trinity-krec
+%{_bindir}/krec
+%{tde_libdir}/kcm_krec.la
+%{tde_libdir}/kcm_krec.so
+%{tde_libdir}/kcm_krec_files.la
+%{tde_libdir}/kcm_krec_files.so
+%{tde_libdir}/krec.la
+%{tde_libdir}/krec.so
+%{tde_libdir}/libkrecexport_ogg.la
+%{tde_libdir}/libkrecexport_ogg.so
+%{tde_libdir}/libkrecexport_wave.la
+%{tde_libdir}/libkrecexport_wave.so
+%{_libdir}/lib[kt]deinit_krec.so
+%{tde_appdir}/krec.desktop
+%{_datadir}/apps/krec/
+%{_datadir}/icons/hicolor/*/apps/krec.png
+%{_datadir}/services/kcm_krec.desktop
+%{_datadir}/services/kcm_krec_files.desktop
+%{_datadir}/services/krec_exportogg.desktop
+%{_datadir}/services/krec_exportwave.desktop
+%{_datadir}/servicetypes/krec_exportitem.desktop
+%{tde_docdir}/HTML/en/krec/
+
+%post -n trinity-krec
+/sbin/ldconfig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-krec
+/sbin/ldconfig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kscd
+Summary:	Audio CD player for Trinity
+Group:		Applications/Multimedia
+
+%description -n trinity-kscd
+This is Trinity's audio CD player.
+
+%files -n trinity-kscd
+%{_bindir}/kscd
+%{_bindir}/workman2cddb.pl
+%{tde_appdir}/kscd.desktop
+%{_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
+%{_datadir}/apps/kscd/
+%{_datadir}/apps/profiles/kscd.profile.xml
+%{_datadir}/config.kcfg/kscd.kcfg
+%{_datadir}/icons/hicolor/*/apps/kscd.png
+%{_datadir}/mimelnk/text/xmcd.desktop
+%{tde_docdir}/HTML/en/kscd/
+
+%post -n trinity-kscd
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kscd
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-libarts-akode
+Summary:	Akode plugin for aRts
+Group:		Environment/Libraries
+
+%description -n trinity-libarts-akode
+This package contains akode plugins for aRts.
+
+%files -n trinity-libarts-akode
+%{_libdir}/libarts_akode.la
+%{_libdir}/libarts_akode.so
+%{_libdir}/libarts_akode.so.*
+%{_libdir}/mcop/akodearts.mcoptype
+%{_libdir}/mcop/akodearts.mcopclass
+%{_libdir}/mcop/akodeMPCPlayObject.mcopclass
+%{_libdir}/mcop/akodePlayObject.mcopclass
+%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeXiphPlayObject.mcopclass
+
+%post -n trinity-libarts-akode
+/sbin/ldconfig
+
+%postun -n trinity-libarts-akode
+/sbin/ldconfig
+
+##########
+
+%package -n trinity-libarts-audiofile
+Summary:	Audiofile plugin for aRts
+Group:		Environment/Libraries
+
+%description -n trinity-libarts-audiofile
+This package contains audiofile plugins for aRts.
+
+%files -n trinity-libarts-audiofile
+%{_libdir}/libarts_audiofile.la
+%{_libdir}/libarts_audiofile.so
+%{_libdir}/libarts_audiofile.so.*
+%{_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
+%{_libdir}/mcop/audiofilearts.mcopclass
+%{_libdir}/mcop/audiofilearts.mcoptype
+
+%post -n trinity-libarts-audiofile
+/sbin/ldconfig
+
+%postun -n trinity-libarts-audiofile
+/sbin/ldconfig
+
+##########
+
+%package -n trinity-libarts-mpeglib
+Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
+Group:		Environment/Libraries
+
+%description -n trinity-libarts-mpeglib
+This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
+audio and video.
+
+This is the arts (TDE Sound daemon) plugin.
+
+%files -n trinity-libarts-mpeglib
+%{_bindir}/mpeglibartsplay
+%{_libdir}/libarts_mpeglib-0.3.0.so.*
+%{_libdir}/libarts_mpeglib.la
+%{_libdir}/libarts_splay.la
+%{_libdir}/libarts_splay.so.*
+%{_libdir}/mcop/CDDAPlayObject.mcopclass
+%{_libdir}/mcop/MP3PlayObject.mcopclass
+%{_libdir}/mcop/NULLPlayObject.mcopclass
+%{_libdir}/mcop/OGGPlayObject.mcopclass
+%{_libdir}/mcop/SplayPlayObject.mcopclass
+%{_libdir}/mcop/WAVPlayObject.mcopclass
+
+%post -n trinity-libarts-mpeglib
+/sbin/ldconfig
+
+%postun -n trinity-libarts-mpeglib
+/sbin/ldconfig
+
+##########
+
+%package -n trinity-libarts-xine
+Summary:	aRts plugin enabling xine support
+Group:		Environment/Libraries
+
+%description -n trinity-libarts-xine
+This package contains aRts' xine plugin, allowing the use of the xine
+multimedia engine though aRts.
+
+%files -n trinity-libarts-xine
+%{tde_libdir}/videothumbnail.la
+%{tde_libdir}/videothumbnail.so
+%{_libdir}/libarts_xine.la
+%{_libdir}/libarts_xine.so
+%{_libdir}/libarts_xine.so.*
+%{_libdir}/mcop/xineAudioPlayObject.mcopclass
+%{_libdir}/mcop/xineVideoPlayObject.mcopclass
+%{_datadir}/apps/videothumbnail/sprocket-large.png
+%{_datadir}/apps/videothumbnail/sprocket-medium.png
+%{_datadir}/apps/videothumbnail/sprocket-small.png
+%{_datadir}/services/videothumbnail.desktop
+
+%post -n trinity-libarts-xine
+/sbin/ldconfig
+
+%postun -n trinity-libarts-xine
+/sbin/ldconfig
+
+##########
+
+%package -n trinity-libkcddb
+Summary:	CDDB library for Trinity
+Group:		Environment/Libraries
+
+%description -n trinity-libkcddb
+The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
+CD meta-information (track titles, artist information, etc.) from on-line
+databases, for TDE applications.
+
+%files -n trinity-libkcddb
+%{tde_libdir}/kcm_cddb.la
+%{tde_libdir}/kcm_cddb.so
+%{_libdir}/libkcddb.so.*
+%{tde_appdir}/libkcddb.desktop
+%{_datadir}/apps/kconf_update/kcmcddb-emailsettings.upd
+%{_datadir}/config.kcfg/libkcddb.kcfg
+
+%post -n trinity-libkcddb
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-libkcddb
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-mpeglib
+Summary:	MP3 and MPEG-1 audio and video library
+Group:		Environment/Libraries
+Requires:	trinity-libarts-mpeglib = %{version}-%{release}
+
+%description -n trinity-mpeglib
+mpeglib is a MPEG-1 and MP3 audio and video library. It supports
+MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
+and WAV playback
+
+%files -n trinity-mpeglib
+%{_bindir}/yaf-cdda
+%{_bindir}/yaf-mpgplay
+%{_bindir}/yaf-splay
+%{_bindir}/yaf-tplay
+%{_bindir}/yaf-vorbis
+%{_bindir}/yaf-yuv
+%{_libdir}/libmpeg-0.3.0.so
+%{_libdir}/libyafcore.so
+%{_libdir}/libyafxplayer.so
+
+%post -n trinity-mpeglib
+/sbin/ldconfig
+
+%postun -n trinity-mpeglib
+/sbin/ldconfig
+
+##########
+
+%package -n trinity-noatun
+Summary:	Media player for Trinity
+Group:		Applications/Multimedia
+
+%description -n trinity-noatun
+Noatun is an aRts-based audio and video player for Trinity. It supports all
+formats supported by your installation of aRts (including aRts plugins).
+
+%files -n trinity-noatun
+%{_bindir}/noatun
+%{_libdir}/kconf_update_bin/noatun20update
+%{tde_libdir}/noatun.la
+%{tde_libdir}/noatun.so
+%{tde_libdir}/noatun_dcopiface.la
+%{tde_libdir}/noatun_dcopiface.so
+%{tde_libdir}/noatun_excellent.la
+%{tde_libdir}/noatun_excellent.so
+%{tde_libdir}/noatun_htmlexport.la
+%{tde_libdir}/noatun_htmlexport.so
+%{tde_libdir}/noatun_infrared.la
+%{tde_libdir}/noatun_infrared.so
+%{tde_libdir}/noatun_kaiman.la
+%{tde_libdir}/noatun_kaiman.so
+%{tde_libdir}/noatun_keyz.la
+%{tde_libdir}/noatun_keyz.so
+%{tde_libdir}/noatun_kjofol.la
+%{tde_libdir}/noatun_kjofol.so
+%{tde_libdir}/noatun_marquis.la
+%{tde_libdir}/noatun_marquis.so
+%{tde_libdir}/noatun_metatag.la
+%{tde_libdir}/noatun_metatag.so
+%{tde_libdir}/noatun_monoscope.la
+%{tde_libdir}/noatun_monoscope.so
+%{tde_libdir}/noatun_net.la
+%{tde_libdir}/noatun_net.so
+%{tde_libdir}/noatun_splitplaylist.la
+%{tde_libdir}/noatun_splitplaylist.so
+%{tde_libdir}/noatun_systray.la
+%{tde_libdir}/noatun_systray.so
+%{tde_libdir}/noatun_ui.la
+%{tde_libdir}/noatun_ui.so
+%{tde_libdir}/noatun_voiceprint.la
+%{tde_libdir}/noatun_voiceprint.so
+%{tde_libdir}/noatun_winskin.la
+%{tde_libdir}/noatun_winskin.so
+%{tde_libdir}/noatunsimple.la
+%{tde_libdir}/noatunsimple.so
+%{_libdir}/libartseffects.la
+%{_libdir}/libartseffects.so
+%{_libdir}/lib[kt]deinit_noatun.so
+%{_libdir}/libnoatun.so.*
+%{_libdir}/libnoatunarts.la
+%{_libdir}/libnoatunarts.so
+%{_libdir}/libnoatuncontrols.so.*
+%{_libdir}/libnoatuntags.so.*
+%{_libdir}/libwinskinvis.la
+%{_libdir}/libwinskinvis.so
+%{_libdir}/mcop/ExtraStereo.mcopclass
+%{_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
+%{_libdir}/mcop/Noatun/Equalizer.mcopclass
+%{_libdir}/mcop/Noatun/EqualizerSSE.mcopclass
+%{_libdir}/mcop/Noatun/FFTScope.mcopclass
+%{_libdir}/mcop/Noatun/FFTScopeStereo.mcopclass
+%{_libdir}/mcop/Noatun/Listener.mcopclass
+%{_libdir}/mcop/Noatun/RawScope.mcopclass
+%{_libdir}/mcop/Noatun/RawScopeStereo.mcopclass
+%{_libdir}/mcop/Noatun/Session.mcopclass
+%{_libdir}/mcop/Noatun/StereoEffectStack.mcopclass
+%{_libdir}/mcop/Noatun/StereoVolumeControl.mcopclass
+%{_libdir}/mcop/Noatun/StereoVolumeControlSSE.mcopclass
+%{_libdir}/mcop/Noatun/WinSkinFFT.mcopclass
+%{_libdir}/mcop/RawWriter.mcopclass
+%{_libdir}/mcop/VoiceRemoval.mcopclass
+%{_libdir}/mcop/artseffects.mcopclass
+%{_libdir}/mcop/artseffects.mcoptype
+%{_libdir}/mcop/noatunarts.mcopclass
+%{_libdir}/mcop/noatunarts.mcoptype
+%{_libdir}/mcop/winskinvis.mcopclass
+%{_libdir}/mcop/winskinvis.mcoptype
+%{tde_appdir}/noatun.desktop
+%{_datadir}/apps/kconf_update/noatun.upd
+%{_datadir}/apps/noatun/
+%{_datadir}/icons/hicolor/*/apps/noatun.png
+%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+%{tde_docdir}/HTML/en/noatun/
+
+%post -n trinity-noatun
+/sbin/ldconfig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-noatun
+/sbin/ldconfig
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
 
 %package devel
-Summary: Development files for %{name}, aRts and noatun plugins
-Group: Development/Libraries
-Provides: kdemultimedia3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-# for noatun shlib(s)
-Requires: %{name}-extras-libs = %{version}-%{release}
-Requires: trinity-kdelibs-devel
+Summary:	Development files for %{name}, aRts and noatun plugins
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-kdelibs-devel
+
+Obsoletes:	trinity-kdemultimedia-devel < %{version}-%{release}
+Provides:	trinity-kdemultimedia-devel = %{version}-%{release}
+
 %description devel
 {summary}.
+
 Install %{name}-devel if you wish to develop or compile any
 applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
 noatun plugins.
 
-%package extras
-Summary: Extra applications from %{name} 
-Group: Applications/Multimedia
-Requires: %{name}-extras-libs = %{version}-%{release}
-%description extras
-%{summary}, including:
- * juk, a media player
- * kaboodle, a media player
- * noatun, a media player
-
-%package extras-libs
-Summary: Extra %{name} runtime libraries 
-Group: System Environment/Libraries 
-Requires: %{name}-libs = %{version}-%{release}
-%description extras-libs
-%{summary}.
-
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-kdelibs
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
+%files devel
+%{tde_includedir}/*
+%{_libdir}/libarts_mpeglib.so
+%{_libdir}/libarts_splay.so
+%{_libdir}/libartsbuilder.so
+%{_libdir}/libartscontrolapplet.so
+%{_libdir}/libartscontrolsupport.so
+%{_libdir}/libartsgui.so
+%{_libdir}/libartsgui_idl.so
+%{_libdir}/libartsgui_kde.so
+%{_libdir}/libartsmidi.so
+%{_libdir}/libartsmidi_idl.so
+%{_libdir}/libartsmodules.so
+%{_libdir}/libartsmodulescommon.so
+%{_libdir}/libartsmoduleseffects.so
+%{_libdir}/libartsmodulesmixers.so
+%{_libdir}/libartsmodulessynth.so
+%{_libdir}/libaudiocdplugins.la
+%{_libdir}/libaudiocdplugins.so
+%{_libdir}/libkcddb.la
+%{_libdir}/libkcddb.so
+%{_libdir}/lib[kt]deinit_kmix.la
+%{_libdir}/lib[kt]deinit_kmixctrl.la
+%{_libdir}/lib[kt]deinit_krec.la
+%{_libdir}/lib[kt]deinit_noatun.la
+%{_libdir}/libkmidlib.la
+%{_libdir}/libkmidlib.so
+%{_libdir}/libmpeg.la
+%{_libdir}/libmpeg.so
+%{_libdir}/libnoatun.la
+%{_libdir}/libnoatun.so
+%{_libdir}/libnoatuncontrols.la
+%{_libdir}/libnoatuncontrols.so
+%{_libdir}/libnoatuntags.la
+%{_libdir}/libnoatuntags.so
+%{_libdir}/libyafcore.la
+%{_libdir}/libyafxplayer.la
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+##########
 
 
 %prep
@@ -138,7 +1035,6 @@ Requires: %{name} = %{version}-%{release}
 %patch10 -p1
 %patch21 -p1 -b .moreapplications
 %patch22 -p1
-%patch23 -p1 -b .kmixautostart
 
 
 # Ugly hack to modify TQT include directory inside autoconf files.
@@ -188,20 +1084,19 @@ export PATH="%{_bindir}:${PATH}"
 %__make install DESTDIR=%{buildroot}
 
 ## Remove/uninstall (conflicting) bits we don't want
-%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
+#%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
 
 # only show in KDE, really? -- Rex (FIXME)
-for f in %{buildroot}%{appdir}/*.desktop ; do
-  if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
-    echo "OnlyShowIn=KDE;" >> $f
-  fi
-done
+#for f in %{buildroot}%{tde_appdir}/*.desktop ; do
+#  if [ -f %{buildroot}%{tde_appdir}/*.desktop ] ; then
+#    echo "OnlyShowIn=KDE;" >> $f
+#  fi
+#done
 
 # don't make these world-writeable
 chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
 
 # locale's
-%find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}$HTML_DIR ]; then
 for lang_dir in %{buildroot}$HTML_DIR/* ; do
@@ -238,187 +1133,16 @@ done
 %__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
 
 
-
-%post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%post extras-libs -p /sbin/ldconfig
-
-%postun extras-libs -p /sbin/ldconfig
-
-%post extras
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun extras
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
 %clean
 %__rm -rf %{buildroot}
 
 
-%files extras
-%defattr(-,root,root,-)
-
-# kaboodle
-%doc rpmdocs/kaboodle/
-%doc %lang(en) %{tde_docdir}/HTML/en/kaboodle/
-%{_bindir}/kaboodle
-%{tde_libdir}/libkaboodlepart.*
-%{_datadir}/applications/kde/kaboodle.desktop
-%{_datadir}/apps/kaboodle/
-%{_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{_datadir}/services/kaboodle*
-
-# noatun
-%doc %lang(en) %{tde_docdir}/HTML/en/noatun/
-%{_bindir}/noatun
-%{_libdir}/kconf_update_bin/noatun20update
-%{tde_libdir}/noatun*
-%{_libdir}/libartseffects.*
-%{_libdir}/libwinskinvis.*
-%{_libdir}/libkdeinit_noatun.*
-%{_datadir}/applications/kde/noatun.desktop
-%{_datadir}/apps/kconf_update/noatun.upd
-%{_datadir}/apps/noatun/
-%{_datadir}/icons/hicolor/*/apps/noatun.png
-%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
-
-# juk
-%doc %lang(en) %{tde_docdir}/HTML/en/juk/
-%{_bindir}/juk
-%{_datadir}/applications/kde/juk.desktop
-%{_datadir}/apps/juk/
-%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{_datadir}/icons/crystalsvg/*/*/juk*
-%{_datadir}/icons/hicolor/*/apps/juk.png
-
-%files extras-libs
-%defattr(-,root,root,-)
-%{_libdir}/libnoatun*.la
-%{_libdir}/libnoatun*.so.*
-%{_libdir}/libnoatunarts.so
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING
-
-# kaboodle
-%exclude %{tde_docdir}/HTML/en/kaboodle/
-%exclude %{_bindir}/kaboodle
-%exclude %{tde_libdir}/libkaboodlepart.*
-%exclude %{_datadir}/applications/kde/kaboodle.desktop
-%exclude %{_datadir}/apps/kaboodle/
-%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png
-%exclude %{_datadir}/services/kaboodle*
-
-# noatun
-%exclude %{tde_docdir}/HTML/en/noatun/
-%exclude %{_bindir}/noatun
-%exclude %{_libdir}/kconf_update_bin/noatun20update
-%exclude %{tde_libdir}/noatun*
-%exclude %{_libdir}/libartseffects.*
-%exclude %{_libdir}/libkdeinit_noatun.*
-%exclude %{_libdir}/libnoatunarts.*
-%exclude %{_libdir}/libnoatuncontrols.*
-%exclude %{_libdir}/libnoatun.*
-%exclude %{_libdir}/libnoatuntags.*
-%exclude %{_libdir}/libwinskinvis.*
-%exclude %{_datadir}/applications/kde/noatun.desktop
-%exclude %{_datadir}/apps/kconf_update/noatun.upd
-%exclude %{_datadir}/apps/noatun/
-%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png
-%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
-
-# juk
-%exclude %{tde_docdir}/HTML/en/juk/
-%exclude %{_bindir}/juk
-%exclude %{_datadir}/applications/kde/juk.desktop
-%exclude %{_datadir}/apps/juk/
-%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
-%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
-
-%{_prefix}/etc/xdg/menus/applications-merged/*
-%{_libdir}/mcop/*
-%{_libdir}/libkdeinit_*.so
-#%{_libdir}/liboggarts.so
-%{_libdir}/libmpeg-0.3.0.so
-%{_libdir}/libyafcore.so
-%{_libdir}/libyafxplayer.so
-%{tde_libdir}/*
-%{_libdir}/kconf_update_bin/*
-%{_bindir}/*
-%{_datadir}/applications/kde/*
-%{_datadir}/apps/*
-%{_datadir}/autostart/*
-%{_datadir}/config.kcfg/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-
-# Misc HTML docs
-%doc %lang(en) %{tde_docdir}/HTML/en/artsbuilder
-%doc %lang(en) %{tde_docdir}/HTML/en/kaudiocreator
-%doc %lang(en) %{tde_docdir}/HTML/en/kioslave/audiocd.docbook
-%doc %lang(en) %{tde_docdir}/HTML/en/kmid
-%doc %lang(en) %{tde_docdir}/HTML/en/kmix
-%doc %lang(en) %{tde_docdir}/HTML/en/krec
-%doc %lang(en) %{tde_docdir}/HTML/en/kscd
-
-
-%files libs
-%defattr(-,root,root,-)
-%exclude %{_libdir}/libnoatun*.*
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%exclude %{_libdir}/libartseffects.so
-%exclude %{_libdir}/libnoatunarts.*
-#exclude %{_libdir}/liboggarts.so
-%exclude %{_libdir}/libwinskinvis.so
-%exclude %{_libdir}/libmpeg-0.3.0.so
-%exclude %{_libdir}/libyafcore.so
-%exclude %{_libdir}/libyafxplayer.so
-
 %changelog
+* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
+- Split in several packages
+- Enables Xine support on RHEL/CentOS
+- Removes previous patch. [Bug #503]
+
 * Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
 - Fix kmix not autostarting in the user's session. [Bug #503]
 
diff --git a/redhat/kdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch b/redhat/kdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch
new file mode 100644
index 000000000..c382ec723
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch
@@ -0,0 +1,19 @@
+commit 82d4a938ce57d8611e1ef2e26924bb4367483b0c
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1341027705 -0500
+
+    Disable unneccesary fsync() in cached IMAP handler
+
+diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
+index 72f1113..e7009a2 100644
+--- a/kmail/kmfoldercachedimap.cpp
++++ b/kmail/kmfoldercachedimap.cpp
+@@ -478,7 +478,7 @@ int KMFolderCachedImap::writeUidCache()
+     str << lastUid() << endl;
+     uidcache.flush();
+     if ( uidcache.status() == IO_Ok ) {
+-      fsync( uidcache.handle() ); /* this is probably overkill */
++      // fsync( uidcache.handle() ); /* this is probably overkill */
+       uidcache.close();
+       if ( uidcache.status() == IO_Ok )
+         return 0;
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 7ebb72390..baf732d4d 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -23,9 +23,9 @@ BuildRequires: cmake >= 2.8
 %define		with_kitchensync 0
 
 
-Name:		tdepim
+Name:		trinity-tdepim
 Version:	3.5.13
-Release:	6%{?dist}%{?_variant}
+Release:	7%{?dist}%{?_variant}
 License:	GPL
 Group:		Applications/Productivity
 
@@ -53,11 +53,13 @@ Patch6:		kdepim-3.5.13-fix_knotes_on_suspend.patch
 Patch7:		kdepim-3.5.13-fix_linear_alphabet.patch
 # [tdepim] Fix infinite loop on IMAP4 authentication failure [Bug #1007]
 Patch8:		kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
-# [tdepim] Fix infinite loop on kmime_utils addquotes
+# [tdepim] Fix infinite loop on kmime_utils addquotes [Bug #1009] [Commit #9b43d6e1] [Commit #b0c92b30]
 Patch9:		kdepim-3.5.13-fix_kio_imap4_addquotes.patch
 Patch10:	kdepim-3.5.13-fix_segv.patch
 # [tdepim] Update kalarmd icon reference, which does not exist, to kalarm. [Commit #228ad1c6]
 Patch11:	kdepim-3.5.13-fix_kalarm_icon_reference.patch
+# [tdepim] Disable unneccesary fsync() in cached IMAP handler [Bug #467] [Commit #82d4a938]
+Patch12:	kdepim-3.5.13-disable_fsync_in_cached_imap.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,11 +93,11 @@ BuildRequires:	trinity-libcurl-devel
 BuildRequires:	curl-devel
 %endif
 
-Requires:	libtdepim = %{version}-%{release}
-Requires:	tdepim-kfile-plugins = %{version}-%{release}
-Requires:	tdepim-kio-plugins = %{version}-%{release}
-Requires:	tdepim-kresources = %{version}-%{release}
-Requires:	tdepim-wizards = %{version}-%{release}
+Requires:	trinity-libtdepim = %{version}-%{release}
+Requires:	%{name}-kfile-plugins = %{version}-%{release}
+Requires:	%{name}-kio-plugins = %{version}-%{release}
+Requires:	%{name}-kresources = %{version}-%{release}
+Requires:	%{name}-wizards = %{version}-%{release}
 Requires:	trinity-akregator = %{version}-%{release}
 Requires:	trinity-kaddressbook = %{version}-%{release}
 Requires:	trinity-kalarm = %{version}-%{release}
@@ -126,6 +128,8 @@ Requires:	trinity-libmimelib = %{version}-%{release}
 
 Obsoletes:	trinity-kdepim < %{version}-%{release}
 Provides:	trinity-kdepim = %{version}-%{release}
+Obsoletes:	tdepim < %{version}-%{release}
+Provides:	tdepim = %{version}-%{release}
 
 %description
 This metapackage includes a collection of Personal Information Management
@@ -139,11 +143,15 @@ This metapackage includes a collection of Personal Information Management
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 
+Obsoletes:	tdepim-cmake < %{version}-%{release}
+
 Obsoletes:	trinity-kdepim-devel < %{version}-%{release}
 Provides:	trinity-kdepim-devel = %{version}-%{release}
+Obsoletes:	tdepim-devel < %{version}-%{release}
+Provides:	tdepim-devel = %{version}-%{release}
 
 Requires:	%{name} = %{version}-%{release}
-Requires:	libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{version}-%{release}
 Requires:	trinity-karm-devel = %{version}-%{release}
 Requires:	trinity-knotes-devel = %{version}-%{release}
 Requires:	trinity-kontact-devel = %{version}-%{release}
@@ -158,20 +166,21 @@ Requires:	trinity-libkpimidentities-devel = %{version}-%{release}
 Requires:	trinity-libksieve-devel = %{version}-%{release}
 Requires:	trinity-libktnef-devel = %{version}-%{release}
 Requires:	trinity-libmimelib-devel = %{version}-%{release}
-Requires:	tdepim-cmake = %{version}-%{release}
-Requires:	tdepim-kresources-devel = %{version}-%{release}
+Requires:	%{name}-kresources-devel = %{version}-%{release}
 
 %description devel
 This metapackage includes all development files for TDE PIM.
+It also contains the CMAKE macros.
 
 %files devel
+%{_datadir}/cmake/*
 
 ##########
 
 %package -n trinity-akregator
 Summary:	RSS feed aggregator for TDE
 Group:		Applications/Internet
-Requires:	libtdepim = %{version}-%{release}
+Requires:	trinity-libtdepim = %{version}-%{release}
 Requires:	trinity-libkcal = %{version}-%{release}
 
 %description -n trinity-akregator
@@ -236,7 +245,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 Summary:	TDE addressbook application
 Group:		Applications/Communications
 Requires:	trinity-kdebase-pim-ioslaves
-Requires:	tdepim-kresources = %{version}-%{release}
+Requires:	%{name}-kresources = %{version}-%{release}
 
 %description -n trinity-kaddressbook
 KAddressBook is the main address book application for TDE; it enables you
@@ -260,17 +269,11 @@ LDAP servers, and SQL databases.
 %{tde_libdir}/libkaddrbk_*.so
 %{tde_libdir}/libkaddressbookpart.la
 %{tde_libdir}/libkaddressbookpart.so
-%{_libdir}/libkabinterfaces.so.1
-%{_libdir}/libkabinterfaces.so.1.0.0
-%{_libdir}/libkaddressbook.so.0
-%{_libdir}/libkaddressbook.so.0.0.0
+%{_libdir}/libkabinterfaces.so.*
+%{_libdir}/libkaddressbook.so.*
 %{tde_appdir}/kaddressbook.desktop
 %{_datadir}/apps/kaddressbook
-%{_datadir}/icons/hicolor/128x128/apps/kaddressbook.png
-%{_datadir}/icons/hicolor/16x16/apps/kaddressbook.png
-%{_datadir}/icons/hicolor/32x32/apps/kaddressbook.png
-%{_datadir}/icons/hicolor/48x48/apps/kaddressbook.png
-%{_datadir}/icons/hicolor/64x64/apps/kaddressbook.png
+%{_datadir}/icons/hicolor/*/apps/kaddressbook.png
 %{_datadir}/services/kabconfig.desktop
 %{_datadir}/services/kabcustomfields.desktop
 %{_datadir}/services/kabldapconfig.desktop
@@ -342,11 +345,8 @@ TDE-based, but will also run on other desktops.
 %{_datadir}/apps/kalarm
 %{_datadir}/autostart/kalarm.tray.desktop
 %{_datadir}/autostart/kalarmd.autostart.desktop
-%{_datadir}/icons/crystalsvg/16x16/actions/kalarm.png
-%{_datadir}/icons/hicolor/16x16/apps/kalarm.png
-%{_datadir}/icons/crystalsvg/22x22/actions/kalarm.png
-%{_datadir}/icons/hicolor/32x32/apps/kalarm.png
-%{_datadir}/icons/hicolor/48x48/apps/kalarm.png
+%{_datadir}/icons/crystalsvg/*/actions/kalarm.png
+%{_datadir}/icons/hicolor/*/apps/kalarm.png
 %{tde_docdir}/HTML/en/kalarm
 
 %post -n trinity-kalarm
@@ -404,8 +404,7 @@ time they spend on various tasks.
 
 %files -n trinity-karm
 %{_bindir}/karm
-%{_libdir}/libkarm.so.0
-%{_libdir}/libkarm.so.0.0.0
+%{_libdir}/libkarm.so.*
 %{tde_libdir}/libkarmpart.la
 %{tde_libdir}/libkarmpart.so
 %{tde_appdir}/karm.desktop
@@ -458,6 +457,8 @@ Group:		Development/Libraries
 Summary:	TDE File dialog plugins for palm and vcf files
 Group:		Environment/Libraries
 
+Obsoletes:	tdepim-kfile-plugins < %{version}-%{release}
+
 %description kfile-plugins
 File dialog plugins for palm and vcf files.
 
@@ -475,6 +476,8 @@ File dialog plugins for palm and vcf files.
 Summary:	Trinity pim I/O Slaves
 Group:		Environment/Libraries
 
+Obsoletes:	tdepim-kio-plugins < %{version}-%{release}
+
 %description kio-plugins
 This package includes the pim kioslaves. This includes imap4, sieve,
 and mbox.
@@ -511,6 +514,8 @@ Group:		Environment/Libraries
 Requires:	libcaldav
 Requires:	libcarddav
 
+Obsoletes:	tdepim-kresources < %{version}-%{release}
+
 %description kresources
 This package includes several plugins needed to interface with groupware
 servers. It also includes plugins for features such as blogging and
@@ -541,54 +546,30 @@ tracking feature plans.
 %{tde_libdir}/knotes_scalix.so
 %{tde_libdir}/knotes_xmlrpc.la
 %{tde_libdir}/knotes_xmlrpc.so
-%{_libdir}/libkabckolab.so.0
-%{_libdir}/libkabckolab.so.0.0.0
-%{_libdir}/libkabcscalix.so.0
-%{_libdir}/libkabcscalix.so.0.0.0
-%{_libdir}/libkabc_groupdav.so.1
-%{_libdir}/libkabc_groupdav.so.1.0.0
-%{_libdir}/libkabc_groupwise.so.1
-%{_libdir}/libkabc_groupwise.so.1.0.0
-%{_libdir}/libkabc_newexchange.so.1
-%{_libdir}/libkabc_newexchange.so.1.0.0
-%{_libdir}/libkabc_slox.so.0
-%{_libdir}/libkabc_slox.so.0.0.0
-%{_libdir}/libkabc_xmlrpc.so.1
-%{_libdir}/libkabc_xmlrpc.so.1.0.0
-%{_libdir}/libkcalkolab.so.0
-%{_libdir}/libkcalkolab.so.0.0.0
-%{_libdir}/libkcalscalix.so.0
-%{_libdir}/libkcalscalix.so.0.0.0
-%{_libdir}/libkcal_caldav.so.1
-%{_libdir}/libkcal_caldav.so.1.0.0
-%{_libdir}/libkabc_carddav.so.1
-%{_libdir}/libkabc_carddav.so.1.0.0
-%{_libdir}/libkcal_groupdav.so.1
-%{_libdir}/libkcal_groupdav.so.1.0.0
-%{_libdir}/libkcal_groupwise.so.1
-%{_libdir}/libkcal_groupwise.so.1.0.0
-%{_libdir}/libkcal_newexchange.so.1
-%{_libdir}/libkcal_newexchange.so.1.0.0
-%{_libdir}/libkcal_resourcefeatureplan.so.1
-%{_libdir}/libkcal_resourcefeatureplan.so.1.0.0
-%{_libdir}/libkcal_slox.so.0
-%{_libdir}/libkcal_slox.so.0.0.0
-%{_libdir}/libkcal_xmlrpc.so.1
-%{_libdir}/libkcal_xmlrpc.so.1.0.0
-%{_libdir}/libkgroupwarebase.so.0
-%{_libdir}/libkgroupwarebase.so.0.0.0
-%{_libdir}/libkgroupwaredav.so.0
-%{_libdir}/libkgroupwaredav.so.0.0.0
-%{_libdir}/libknoteskolab.so.0
-%{_libdir}/libknoteskolab.so.0.0.0
-%{_libdir}/libknotesscalix.so.0
-%{_libdir}/libknotesscalix.so.0.0.0
-%{_libdir}/libknotes_xmlrpc.so.1
-%{_libdir}/libknotes_xmlrpc.so.1.0.0
-%{_libdir}/libkslox.so.0
-%{_libdir}/libkslox.so.0.0.0
-%{_libdir}/libgwsoap.so.0
-%{_libdir}/libgwsoap.so.0.0.0
+%{_libdir}/libkabckolab.so.*
+%{_libdir}/libkabcscalix.so.*
+%{_libdir}/libkabc_groupdav.so.*
+%{_libdir}/libkabc_groupwise.so.*
+%{_libdir}/libkabc_newexchange.so.*
+%{_libdir}/libkabc_slox.so.*
+%{_libdir}/libkabc_xmlrpc.so.*
+%{_libdir}/libkcalkolab.so.*
+%{_libdir}/libkcalscalix.so.*
+%{_libdir}/libkcal_caldav.so.*
+%{_libdir}/libkabc_carddav.so.*
+%{_libdir}/libkcal_groupdav.so.*
+%{_libdir}/libkcal_groupwise.so.*
+%{_libdir}/libkcal_newexchange.so.*
+%{_libdir}/libkcal_resourcefeatureplan.so.*
+%{_libdir}/libkcal_slox.so.*
+%{_libdir}/libkcal_xmlrpc.so.*
+%{_libdir}/libkgroupwarebase.so.*
+%{_libdir}/libkgroupwaredav.so.*
+%{_libdir}/libknoteskolab.so.*
+%{_libdir}/libknotesscalix.so.*
+%{_libdir}/libknotes_xmlrpc.so.*
+%{_libdir}/libkslox.so.*
+%{_libdir}/libgwsoap.so.*
 %{_datadir}/services/kresources/kabc/kabc_groupdav.desktop
 %{_datadir}/services/kresources/kabc/kabc_groupwise.desktop
 %{_datadir}/services/kresources/kabc/kabc_newexchange.desktop
@@ -646,10 +627,12 @@ tracking feature plans.
 %package kresources-devel
 Summary:	Development files for kresources
 Group:		Development/Libraries
-Requires:	tdepim-kresources = %{version}-%{release}
+Requires:	%{name}-kresources = %{version}-%{release}
 Requires:	libcaldav
 Requires:	libcarddav
 
+Obsoletes:	tdepim-kresources-devel < %{version}-%{release}
+
 %description kresources-devel
 %{summary}
 
@@ -716,6 +699,8 @@ Requires:	libcarddav
 Summary:	Trinity server configuration wizards
 Group:		Applications/Communications
 
+Obsoletes:	tdepim-wizards < %{version}-%{release}
+
 %description wizards
 This package contains KDE-based wizards for configuring eGroupware,
 Kolab, and SUSE Linux Openexchange servers.
@@ -772,15 +757,10 @@ development (?).  Kitchensync uses opensync.
 %{tde_libdir}/libkitchensyncpart.la
 %{tde_libdir}/libkitchensyncpart.so
 %{_datadir}/apps/kitchensync
-%{_libdir}/libkitchensync.so.0
-%{_libdir}/libkitchensync.so.0.0.0
-%{_libdir}/libqopensync.so.0
-%{_libdir}/libqopensync.so.0.0.0
+%{_libdir}/libkitchensync.so.*
+%{_libdir}/libqopensync.so.*
 %{tde_appdir}/kitchensync.desktop
-%{_datadir}/icons/hicolor/16x16/apps/kitchensync.png
-%{_datadir}/icons/hicolor/22x22/apps/kitchensync.png
-%{_datadir}/icons/hicolor/32x32/apps/kitchensync.png
-%{_datadir}/icons/hicolor/48x48/apps/kitchensync.png
+%{_datadir}/icons/hicolor/*/apps/kitchensync.png
 
 %post -n trinity-kitchensync
 /sbin/ldconfig
@@ -827,7 +807,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %package -n trinity-kmail
 Summary:	Trinity Email client
 Group:		Applications/Communications
-Requires:	tdepim-kio-plugins = %{version}-%{release}
+Requires:	%{name}-kio-plugins = %{version}-%{release}
 Requires:	gnupg2
 Requires:	pinentry
 Requires:	procmail
@@ -842,8 +822,8 @@ KMail is a fully-featured email client that fits nicely into the TDE
 desktop. It has features such as support for IMAP, POP3, multiple accounts,
 mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
 
-You need to install tdepim-kio-plugins if you want to use IMAP or
-mbox files, and/or tdebase-kio-plugins if you want to use POP3.
+You need to install %{name}-kio-plugins if you want to use IMAP or
+mbox files, and/or trinity-tdebase-kio-plugins if you want to use POP3.
 
 %files -n trinity-kmail
 %{_datadir}/config/kmail.antispamrc
@@ -892,14 +872,8 @@ mbox files, and/or tdebase-kio-plugins if you want to use POP3.
 %{_datadir}/config.kcfg/customtemplates_kfg.kcfg
 %{_datadir}/config.kcfg/replyphrases.kcfg
 %{_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
-%{_datadir}/icons/hicolor/128x128/apps/kmail.png
-%{_datadir}/icons/hicolor/16x16/apps/kmail.png
-%{_datadir}/icons/hicolor/22x22/apps/kmail.png
-%{_datadir}/icons/crystalsvg/22x22/apps/kmaillight.png
-%{_datadir}/icons/hicolor/32x32/apps/kmail.png
-%{_datadir}/icons/crystalsvg/32x32/apps/kmaillight.png
-%{_datadir}/icons/hicolor/48x48/apps/kmail.png
-%{_datadir}/icons/hicolor/64x64/apps/kmail.png
+%{_datadir}/icons/crystalsvg/*/apps/kmaillight.png
+%{_datadir}/icons/hicolor/*/apps/kmail.png
 %{_datadir}/icons/hicolor/scalable/apps/kmail.svgz
 %{_datadir}/services/kmail_config_*.desktop
 %{_datadir}/services/kontact/kmailplugin.desktop
@@ -940,9 +914,7 @@ include Outlook Express, Evolution, and plain mbox.
 %{_bindir}/kmailcvt
 %{_datadir}/applnk/Utilities/kmailcvt.desktop
 %{_datadir}/apps/kmailcvt
-%{_datadir}/icons/crystalsvg/16x16/apps/kmailcvt.png
-%{_datadir}/icons/crystalsvg/32x32/apps/kmailcvt.png
-%{_datadir}/icons/crystalsvg/48x48/apps/kmailcvt.png
+%{_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
 
 %post -n trinity-kmailcvt
 for f in crystalsvg ; do
@@ -981,16 +953,8 @@ signatures.
 %{tde_appdir}/KNode.desktop
 %{_datadir}/apps/knode
 %{tde_docdir}/HTML/en/knode
-%{_datadir}/icons/hicolor/128x128/apps/knode.png
-%{_datadir}/icons/hicolor/128x128/apps/knode2.png
-%{_datadir}/icons/hicolor/16x16/apps/knode.png
-%{_datadir}/icons/hicolor/16x16/apps/knode2.png
-%{_datadir}/icons/hicolor/32x32/apps/knode.png
-%{_datadir}/icons/hicolor/32x32/apps/knode2.png
-%{_datadir}/icons/hicolor/48x48/apps/knode.png
-%{_datadir}/icons/hicolor/48x48/apps/knode2.png
-%{_datadir}/icons/hicolor/64x64/apps/knode.png
-%{_datadir}/icons/hicolor/64x64/apps/knode2.png
+%{_datadir}/icons/hicolor/*/apps/knode.png
+%{_datadir}/icons/hicolor/*/apps/knode2.png
 %{_datadir}/services/knewsservice.protocol
 %{_datadir}/services/knode_config_*.desktop
 %{_datadir}/services/kontact/knodeplugin.desktop
@@ -1016,7 +980,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %package -n trinity-knotes
 Summary:	Trinity sticky notes
 Group:		Applications/Utilities
-Requires:	tdepim-kresources = %{version}-%{release}
+Requires:	trinity-tdepim-kresources = %{version}-%{release}
 
 %description -n trinity-knotes
 KNotes is a program that lets you write sticky notes. The notes are saved
@@ -1027,8 +991,7 @@ program.  The program supports printing and mailing your notes.
 %{_bindir}/knotes
 %{tde_libdir}/knotes_local.la
 %{tde_libdir}/knotes_local.so
-%{_libdir}/libknotes.so.0
-%{_libdir}/libknotes.so.0.0.0
+%{_libdir}/libknotes.so.*
 %{tde_appdir}/knotes.desktop
 %{_datadir}/apps/knotes
 %{_datadir}/config.kcfg/knoteconfig.kcfg
@@ -1062,7 +1025,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 Summary:	Development files for knots
 Group:		Development/Libraries
 Requires:	trinity-knotes = %{version}-%{release}
-Requires:	tdepim-kresources-devel = %{version}-%{release}
+Requires:	%{name}-kresources-devel = %{version}-%{release}
 
 %description -n trinity-knotes-devel
 %{summary}
@@ -1095,8 +1058,7 @@ described by RelaxNG schemes.
 %{_bindir}/kxml_compiler
 %{_libdir}/libkode.la
 %{_libdir}/libkode.so
-%{_libdir}/libkode.so.1
-%{_libdir}/libkode.so.1.0.0
+%{_libdir}/libkode.so.*
 
 %post -n trinity-kode
 /sbin/ldconfig
@@ -1118,9 +1080,7 @@ frontend to manage your calendars.
 %files -n trinity-konsolekalendar
 %{_bindir}/konsolekalendar
 %{tde_appdir}/konsolekalendar.desktop
-%{_datadir}/icons/crystalsvg/16x16/apps/konsolekalendar.png
-%{_datadir}/icons/crystalsvg/22x22/apps/konsolekalendar.png
-%{_datadir}/icons/crystalsvg/32x32/apps/konsolekalendar.png
+%{_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
 %{tde_docdir}/HTML/en/konsolekalendar
 
 %post -n trinity-konsolekalendar
@@ -1171,10 +1131,8 @@ scheduling, address book and other PIM functionality.
 %{tde_libdir}/kcm_sdsummary.so
 %{tde_libdir}/libkontact_*.la
 %{tde_libdir}/libkontact_*.so
-%{_libdir}/libkontact.so.1
-%{_libdir}/libkontact.so.1.0.0
-%{_libdir}/libkpinterfaces.so.1
-%{_libdir}/libkpinterfaces.so.1.0.0
+%{_libdir}/libkontact.so.*
+%{_libdir}/libkpinterfaces.so.*
 %{tde_appdir}/Kontact.desktop
 %{tde_appdir}/kontactdcop.desktop
 %{_datadir}/apps/kontact
@@ -1242,7 +1200,7 @@ Summary:	Trinity personal organizer
 Group:		Applications/Productivity
 Requires:	trinity-libkpimidentities = %{version}-%{release}
 Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	tdepim-kresources = %{version}-%{release}
+Requires:	%{name}-kresources = %{version}-%{release}
 
 %description -n trinity-korganizer
 This package contains KOrganizer, a calendar and scheduling program.
@@ -1266,27 +1224,18 @@ installed.
 %{tde_libdir}/libkorg_*.so
 %{tde_libdir}/libkorganizerpart.la
 %{tde_libdir}/libkorganizerpart.so
-%{_libdir}/libkocorehelper.so.1
-%{_libdir}/libkocorehelper.so.1.0.0
-%{_libdir}/libkorg_stdprinting.so.1
-%{_libdir}/libkorg_stdprinting.so.1.0.0
-%{_libdir}/libkorganizer.so.1
-%{_libdir}/libkorganizer.so.1.0.0
-%{_libdir}/libkorganizer_calendar.so.1
-%{_libdir}/libkorganizer_calendar.so.1.0.0
-%{_libdir}/libkorganizer_eventviewer.so.1
-%{_libdir}/libkorganizer_eventviewer.so.1.0.0
+%{_libdir}/libkocorehelper.so.*
+%{_libdir}/libkorg_stdprinting.so.*
+%{_libdir}/libkorganizer.so.*
+%{_libdir}/libkorganizer_calendar.so.*
+%{_libdir}/libkorganizer_eventviewer.so.*
 %{tde_appdir}/korganizer.desktop
 %{_datadir}/apps/kconf_update/korganizer.upd
 %{_datadir}/apps/korgac
 %{_datadir}/apps/korganizer
 %{_datadir}/autostart/korgac.desktop
 %{_datadir}/config.kcfg/korganizer.kcfg
-%{_datadir}/icons/hicolor/128x128/apps/korganizer.png
-%{_datadir}/icons/hicolor/16x16/apps/korganizer.png
-%{_datadir}/icons/hicolor/32x32/apps/korganizer.png
-%{_datadir}/icons/hicolor/48x48/apps/korganizer.png
-%{_datadir}/icons/hicolor/64x64/apps/korganizer.png
+%{_datadir}/icons/hicolor/*/apps/korganizer.png
 %{_datadir}/services/kontact/korganizerplugin.desktop
 %{_datadir}/services/kontact/journalplugin.desktop
 %{_datadir}/services/kontact/todoplugin.desktop
@@ -1352,7 +1301,7 @@ Requires:	trinity-korganizer = %{version}-%{release}
 %package -n trinity-korn
 Summary:	Trinity mail checker
 Group:		Applications/Communications
-Requires:	tdepim-kio-plugins = %{version}-%{release}
+Requires:	%{name}-kio-plugins = %{version}-%{release}
 #Requires:	tdebase-kio-plugins-trinity
 
 %description -n trinity-korn
@@ -1371,9 +1320,7 @@ Korn run a program once you click on the docked icon in Kicker.
 %{_datadir}/apps/kconf_update/korn-3-5-metadata-update.pl
 %{_datadir}/apps/kconf_update/korn-3-5-ssl-update.pl
 %{_datadir}/apps/kconf_update/korn-3-5-update.upd
-%{_datadir}/icons/hicolor/16x16/apps/korn.png
-%{_datadir}/icons/hicolor/32x32/apps/korn.png
-%{_datadir}/icons/hicolor/48x48/apps/korn.png
+%{_datadir}/icons/hicolor/*/apps/korn.png
 %{tde_docdir}/HTML/en/korn
 
 %post -n trinity-korn
@@ -1407,9 +1354,8 @@ mail servers and embed the mail properties as well as the actual attachments.
 %{_bindir}/ktnef
 %{tde_appdir}/ktnef.desktop
 %{_datadir}/apps/ktnef
-%{_datadir}/icons/hicolor/48x48/apps/ktnef.png
-%{_datadir}/icons/locolor/16x16/apps/ktnef.png
-%{_datadir}/icons/locolor/32x32/apps/ktnef.png
+%{_datadir}/icons/hicolor/*/apps/ktnef.png
+%{_datadir}/icons/locolor/*/apps/ktnef.png
 %{_datadir}/mimelnk/application/ms-tnef.desktop
 %{tde_docdir}/HTML/en/ktnef
 
@@ -1440,8 +1386,7 @@ to implement fast searches in mail bodies.
 This is the runtime package for programs that use the libindex library.
 
 %files -n trinity-libindex
-%{_libdir}/libindex.so.0
-%{_libdir}/libindex.so.0.0.0
+%{_libdir}/libindex.so.*
 
 %post -n trinity-libindex
 /sbin/ldconfig
@@ -1480,7 +1425,7 @@ library.
 %package -n trinity-libkcal
 Summary:	Trinity calendaring library
 Group:		Environment/Libraries
-#Requires:	tdepim-kresources = %{version}-%{release}
+#Requires:	%{name}-kresources = %{version}-%{release}
 
 %description -n trinity-libkcal
 This library provides a C++ API for handling the vCalendar and iCalendar
@@ -1497,12 +1442,9 @@ This is the runtime package for programs that use the libkcal-trinity library.
 %{tde_libdir}/kcal_local.so
 %{tde_libdir}/kcal_remote.la
 %{tde_libdir}/kcal_remote.so
-%{_libdir}/libkcal.so.2
-%{_libdir}/libkcal.so.2.0.0
-%{_libdir}/libkcal_resourceremote.so.1
-%{_libdir}/libkcal_resourceremote.so.1.0.0
-%{_libdir}/libkholidays.so.1
-%{_libdir}/libkholidays.so.1.0.0
+%{_libdir}/libkcal.so.*
+%{_libdir}/libkcal_resourceremote.so.*
+%{_libdir}/libkholidays.so.*
 %{_datadir}/apps/libkholidays
 %{_datadir}/services/kresources/kcal/imap.desktop
 %{_datadir}/services/kresources/kcal/kabc.desktop
@@ -1523,7 +1465,7 @@ This is the runtime package for programs that use the libkcal-trinity library.
 Summary:	Trinity calendaring library [development]
 Group:		Development/Libraries
 Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{version}-%{release}
 Requires:	trinity-libktnef-devel = %{version}-%{release}
 
 %description -n trinity-libkcal-devel
@@ -1552,21 +1494,23 @@ library.
 
 ##########
 
-%package -n libtdepim
+%package -n trinity-libtdepim
 Summary:	Trinity PIM library
 Group:		Environment/Libraries
 Requires:	trinity-libkcal = %{version}-%{release}
 
-%description -n libtdepim
+Obsoletes:	libtdepim < %{version}-%{release}
+Provides:	libtdepim = %{version}-%{release}
+
+%description -n trinity-libtdepim
 This is the runtime package for programs that use the libtdepim-trinity library.
 
-%files -n libtdepim
+%files -n trinity-libtdepim
 %{tde_libdir}/plugins/designer/[kt]depimwidgets.la
 %{tde_libdir}/plugins/designer/[kt]depimwidgets.so
 %{tde_libdir}/plugins/designer/kpartsdesignerplugin.la
 %{tde_libdir}/plugins/designer/kpartsdesignerplugin.so
-%{_libdir}/lib[kt]depim.so.1
-%{_libdir}/lib[kt]depim.so.1.0.0
+%{_libdir}/lib[kt]depim.so.*
 %{_datadir}/apps/[kt]depimwidgets
 %{_datadir}/apps/lib[kt]depim
 %{_datadir}/apps/[kt]depim
@@ -1574,14 +1518,14 @@ This is the runtime package for programs that use the libtdepim-trinity library.
 %{_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
 %{_datadir}/icons/crystalsvg/22x22/actions/button_more.png
 
-%post -n libtdepim
+%post -n trinity-libtdepim
 for f in crystalsvg ; do
   touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
 done
 /sbin/ldconfig
 
-%postun -n libtdepim
+%postun -n trinity-libtdepim
 for f in crystalsvg ; do
   touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
@@ -1590,25 +1534,28 @@ done
 
 ##########
 
-%package -n libtdepim-devel
+%package -n trinity-libtdepim-devel
 Summary:	Trinity PIM library [development]
 Group:		Development/Libraries
-Requires:	libtdepim = %{version}-%{release}
+Requires:	trinity-libtdepim = %{version}-%{release}
 Requires:	trinity-kdelibs-devel
 
-%description -n libtdepim-devel
+Obsoletes:	libtdepim-devel < %{version}-%{release}
+Provides:	libtdepim-devel = %{version}-%{release}
+
+%description -n trinity-libtdepim-devel
 This is the development package which contains the headers for the libtdepim-trinity
 library.
 
-%files -n libtdepim-devel
+%files -n trinity-libtdepim-devel
 %{tde_includedir}/[kt]depimmacros.h
 %{_libdir}/lib[kt]depim.la
 %{_libdir}/lib[kt]depim.so
 
-%post -n libtdepim-devel
+%post -n trinity-libtdepim-devel
 /sbin/ldconfig
 
-%postun -n libtdepim-devel
+%postun -n trinity-libtdepim-devel
 /sbin/ldconfig
 
 ##########
@@ -1621,8 +1568,7 @@ Group:		Environment/Libraries
 This is the runtime package for programs that use the libkgantt-trinity library.
 
 %files -n trinity-libkgantt
-%{_libdir}/libkgantt.so.0
-%{_libdir}/libkgantt.so.0.0.2
+%{_libdir}/libkgantt.so.*
 %{_datadir}/apps/kgantt
 
 %post -n trinity-libkgantt
@@ -1637,7 +1583,7 @@ This is the runtime package for programs that use the libkgantt-trinity library.
 Summary:	Trinity gantt charting library [development]
 Group:		Development/Libraries
 Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
 %description -n trinity-libkgantt-devel
 This is the development package which contains the headers for the libkgantt-trinity
@@ -1669,23 +1615,15 @@ This is the runtime package for programs that use the libkleopatra-trinity libra
 
 %files -n trinity-libkleopatra
 %{_datadir}/config/libkleopatrarc
-%{_libdir}/libgpgme++.so.0
-%{_libdir}/libgpgme++.so.0.4.0
-%{_libdir}/libkleopatra.so.1
-%{_libdir}/libkleopatra.so.1.0.0
-%{_libdir}/libkpgp.so.2
-%{_libdir}/libkpgp.so.2.2.0
-%{_libdir}/libqgpgme.so.0
-%{_libdir}/libqgpgme.so.0.0.0
+%{_libdir}/libgpgme++.so.*
+%{_libdir}/libkleopatra.so.*
+%{_libdir}/libkpgp.so.*
+%{_libdir}/libqgpgme.so.*
 %{_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 %{_datadir}/apps/kconf_update/kpgp.upd
-%{_datadir}/apps/libkleopatra
-%{_datadir}/icons/crystalsvg/16x16/apps/gpg.png
-%{_datadir}/icons/crystalsvg/16x16/apps/gpgsm.png
-%{_datadir}/icons/crystalsvg/22x22/apps/gpg.png
-%{_datadir}/icons/crystalsvg/22x22/apps/gpgsm.png
-%{_datadir}/icons/crystalsvg/32x32/apps/gpg.png
-%{_datadir}/icons/crystalsvg/32x32/apps/gpgsm.png
+%{_datadir}/apps/libkleopatra/
+%{_datadir}/icons/crystalsvg/*/apps/gpg.png
+%{_datadir}/icons/crystalsvg/*/apps/gpgsm.png
 
 %post -n trinity-libkleopatra
 for f in crystalsvg ; do
@@ -1707,7 +1645,7 @@ done
 Summary:	Trinity GnuPG interface libraries [development]
 Group:		Development/Libraries
 Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
 %description -n trinity-libkleopatra-devel
 This library is used by several KDE applications to interface to the
@@ -1749,8 +1687,7 @@ This library provides a C++ interface to MIME messages, parsing them into
 an object tree.
 
 %files -n trinity-libkmime
-%{_libdir}/libkmime.so.2
-%{_libdir}/libkmime.so.2.2.0
+%{_libdir}/libkmime.so.*
 
 %post -n trinity-libkmime
 /sbin/ldconfig
@@ -1791,8 +1728,7 @@ library.
 %files -n trinity-libkpimexchange
 %{tde_libdir}/resourcecalendarexchange.la
 %{tde_libdir}/resourcecalendarexchange.so
-%{_libdir}/libkpimexchange.so.1
-%{_libdir}/libkpimexchange.so.1.0.0
+%{_libdir}/libkpimexchange.so.*
 
 %post -n trinity-libkpimexchange
 /sbin/ldconfig
@@ -1807,7 +1743,7 @@ Summary:	Trinity PIM Exchange library [development]
 Group:		Development/Libraries
 Requires:	trinity-libkpimexchange = %{version}-%{release}
 Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
 %description -n trinity-libkpimexchange-devel
 This is the development package which contains the headers for the
@@ -1839,8 +1775,7 @@ This is the runtime package for programs that use the libkpimidentities-trinity
 library.
 
 %files -n trinity-libkpimidentities
-%{_libdir}/libkpimidentities.so.1
-%{_libdir}/libkpimidentities.so.1.0.0
+%{_libdir}/libkpimidentities.so.*
 
 %post -n trinity-libkpimidentities
 /sbin/ldconfig
@@ -1878,8 +1813,7 @@ Group:		Environment/Libraries
 This is the runtime package for programs that use the libksieve-trinity library.
 
 %files -n trinity-libksieve
-%{_libdir}/libksieve.so.0
-%{_libdir}/libksieve.so.0.0.0
+%{_libdir}/libksieve.so.*
 
 %post -n trinity-libksieve
 /sbin/ldconfig
@@ -1893,7 +1827,7 @@ This is the runtime package for programs that use the libksieve-trinity library.
 Summary:	Trinity mail/news message filtering library [development]
 Group:		Development/Libraries
 Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
 %description -n trinity-libksieve-devel
 This is the development package which contains the headers for the libksieve-trinity
@@ -1925,8 +1859,7 @@ attachments.
 This is the runtime library for packages using the ktnef-trinity library.
 
 %files -n trinity-libktnef
-%{_libdir}/libktnef.so.1
-%{_libdir}/libktnef.so.1.0.0
+%{_libdir}/libktnef.so.*
 
 %post -n trinity-libktnef
 /sbin/ldconfig
@@ -1937,10 +1870,10 @@ This is the runtime library for packages using the ktnef-trinity library.
 ##########
 
 %package -n trinity-libktnef-devel
-Summary: KTNEF handler library [development]
+Summary:	KTNEF handler library [development]
 Group:		Development/Libraries
-Requires: trinity-libktnef = %{version}-%{release}
-Requires: libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libktnef = %{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
 %description -n trinity-libktnef-devel
 This library handles mail attachments using the TNEF format. These
@@ -1974,8 +1907,7 @@ This library is used by several Trinity applications to handle mime types.
 This is the runtime package for programs that use the libmimelib-trinity library.
 
 %files -n trinity-libmimelib
-%{_libdir}/libmimelib.so.1
-%{_libdir}/libmimelib.so.1.0.1
+%{_libdir}/libmimelib.so.*
 
 %post -n trinity-libmimelib
 /sbin/ldconfig
@@ -2055,18 +1987,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
-%package cmake
-Summary:	CMAKE files and macros for tdepim.
-Group:		Development/Libraries
-
-%description cmake
-%{summary}
-
-%files cmake
-%{_datadir}/cmake
-
-##########
-
 %prep
 %setup -q -n kdepim
 %patch1 -p1 -b .gcc47
@@ -2080,6 +2000,7 @@ Group:		Development/Libraries
 %patch9 -p1 -b .addquotes
 %patch10 -p1 -b .segv
 %patch11 -p1
+%patch12 -p1
 
 
 %build
@@ -2131,6 +2052,10 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %changelog
+* Sat Jun 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
+- Rename 'tdepim' to 'trinity-tdepim'
+- Disable unneccesary fsync() in cached IMAP handler [Bug #467] [Commit #82d4a938]
+
 * Sat Jun 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
 - Rename 'kdepim' to 'tdepim'
 - Add 'Requires: trinity-kdebase-pim-ioslaves' to add POP3 support to kmail
diff --git a/redhat/tdebase b/redhat/tdebase
deleted file mode 120000
index 40cf4e3ad..000000000
--- a/redhat/tdebase
+++ /dev/null
@@ -1 +0,0 @@
-kdebase
\ No newline at end of file
diff --git a/redhat/tdelibs b/redhat/tdelibs
deleted file mode 120000
index 028555378..000000000
--- a/redhat/tdelibs
+++ /dev/null
@@ -1 +0,0 @@
-kdelibs
\ No newline at end of file