RPM Packaging: update lots of main packages

23 files changed, 154 insertions, 49 deletions

diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index 38909b465..6e2e91b3f 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -136,12 +136,14 @@ Requires: trinity-konversation
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
 Requires: trinity-kpilot
+Requires: trinity-krecipes
 Requires: trinity-krename
 Requires: trinity-krusader
 Requires: trinity-ksensors
 Requires: trinity-ksplash-engine-moodin
 Requires: trinity-ksquirrel
 Requires: trinity-kshowmail
+Requires: trinity-kshutdown
 Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
@@ -173,6 +175,7 @@ Requires: trinity-tdesudo
 Requires: trinity-tdesvn
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
+Requires: trinity-tork
 Requires: trinity-twin-style-crystal
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
@@ -223,7 +226,6 @@ Requires:	trinity-kickoff-i18n
 Requires:	trinity-style-ia-ora
 #Requires:	trinity-tdeio-sysinfo-plugin
 Requires:	trinity-theme-baghira
-Requires:	trinity-tork
 
 
 # GLIBC too old on RHEL <= 5
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
index 1be2903de..9eb013d69 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
@@ -301,6 +301,18 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmiccconfig.po tde-i18n-fr/messages
 +msgid "Rotate screen by:"
 +msgstr "Rotation:"
 +
+diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmkeys.po tde-i18n-fr/messages/tdebase/kcmkeys.po
+--- tde-i18n-fr.ORI/messages/tdebase/kcmkeys.po	2013-07-26 17:53:39.998658707 +0200
++++ tde-i18n-fr/messages/tdebase/kcmkeys.po	2013-07-30 19:07:57.740589937 +0200
+@@ -798,3 +798,8 @@
+ #: ../../kxkb/kxkbbindings.cpp:10
+ msgid "Switch to Next Keyboard Layout"
+ msgstr "Passer à la disposition de clavier suivante"
++
++# TDE
++msgid "Use Win key as modifier (uncheck to bind Win key to Menu)"
++msgstr "Utiliser la touche Windows comme touche morte (décocher pour qu'elle affiche le menu)"
++
 diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmkicker.po tde-i18n-fr/messages/tdebase/kcmkicker.po
 --- tde-i18n-fr.ORI/messages/tdebase/kcmkicker.po	2013-07-26 17:53:39.997658734 +0200
 +++ tde-i18n-fr/messages/tdebase/kcmkicker.po	2013-07-26 19:03:14.389313481 +0200
@@ -868,7 +880,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcontrol.po tde-i18n-fr/messages/tde
  msgid "Current Maintainer"
 diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kdesktop.po tde-i18n-fr/messages/tdebase/kdesktop.po
 --- tde-i18n-fr.ORI/messages/tdebase/kdesktop.po	2013-07-26 17:53:39.996658761 +0200
-+++ tde-i18n-fr/messages/tdebase/kdesktop.po	2013-07-26 17:53:51.199360249 +0200
++++ tde-i18n-fr/messages/tdebase/kdesktop.po	2013-07-30 18:33:19.477513086 +0200
 @@ -553,6 +553,36 @@
  "</ul>\n"
  "</qt>"
@@ -906,19 +918,19 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kdesktop.po tde-i18n-fr/messages/tde
  #. i18n: file minicli_ui.ui line 199
  #: rc.cpp:14
  #, no-c-format
-@@ -1144,3 +1174,20 @@
+@@ -1144,3 +1174,29 @@
  "Cependant, certains écrans de veille\n"
  "       effectuent des calculs utiles, dans ces cas, il est souhaitable de ne "
  "pas les désactiver."
 +
-+### TDE 3.5.13 ###
++### TDE ###
 +#: lockdlg.cc:109
 +msgid "Desktop Session Locked"
 +msgstr "Session de bureau verrouillée"
 +
 +#: lockdlg.cc:128
 +msgid "This computer is in use and has been locked."
-+msgstr "Cet ordinateur est en cours d'utilisation et a été verrouillé."
++msgstr "Cet ordinateur est utilisé et verrouillé."
 +
 +#: lockdlg.cc:129
 +msgid "Only '%1' may unlock this session."
@@ -927,6 +939,15 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kdesktop.po tde-i18n-fr/messages/tde
 +#: lockdlg.cc:139
 +msgid "This session has been locked since %1"
 +msgstr "Cette session est verrouillée depuis %1"
++
++msgid "Task Manager"
++msgstr "Gestionnaire de taches"
++
++msgid "Logoff Menu"
++msgstr "Menu de déconnexion"
++
++msgid "'%1' is currently logged on"
++msgstr "'%1' est actuellement connecté"
 diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kicker.po tde-i18n-fr/messages/tdebase/kicker.po
 --- tde-i18n-fr.ORI/messages/tdebase/kicker.po	2013-07-26 17:53:39.996658761 +0200
 +++ tde-i18n-fr/messages/tdebase/kicker.po	2013-07-26 17:53:59.000152412 +0200
@@ -1467,13 +1488,13 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kpersonalizer.po tde-i18n-fr/message
  #: rc.cpp:80
 diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksmserver.po tde-i18n-fr/messages/tdebase/ksmserver.po
 --- tde-i18n-fr.ORI/messages/tdebase/ksmserver.po	2013-07-26 17:53:39.995658788 +0200
-+++ tde-i18n-fr/messages/tdebase/ksmserver.po	2013-07-26 17:53:59.003152332 +0200
-@@ -92,3 +92,50 @@
++++ tde-i18n-fr/messages/tdebase/ksmserver.po	2013-07-29 11:12:48.861837356 +0200
+@@ -92,3 +92,82 @@
  "_: current option in boot loader\n"
  " (current)"
  msgstr " (courant)"
 +
-+### TDE 3.5.13 ###
++### TDE ###
 +
 +#: shutdown.cpp:202
 +msgid "Synchronizing remote folders"
@@ -1519,6 +1540,38 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksmserver.po tde-i18n-fr/messages/td
 +msgid "Confirm"
 +msgstr "Confirmer"
 +
++msgid "Notifying applications of logout request..."
++msgstr "Notification des applications de la déconnexion..."
++
++msgid "Notifying remaining applications of logout request (%1/%2)..."
++msgstr "Notification des applications restantes de la déconnexion... (%1/%2)..."
++
++msgid "Notifying remaining applications of logout request (%1/%2, %3)..."
++msgstr "Notification des applications restantes de la déconnexion... (%1/%2, %3)..."
++
++msgid "Notifying applications of logout request (%1/%2)..."
++msgstr "Notification des applications de la déconnexion (%1/%2)..."
++
++msgid "Notifying applications of logout request (%1/%2, %3)..."
++msgstr "Notification des applications de la déconnexion (%1/%2, %3)..."
++
++msgid "Skip Notification"
++msgstr "Ignorer la notification"
++
++msgid "Skip Notification (%1)"
++msgstr "Ignorer la notification (%1)"
++
++msgid "Abort Logout"
++msgstr "Annuler la déconnexion"
++
++msgid "Closing applications (%1/%2)..."
++msgstr "Fermeture des applications (%1/%2)..."
++
++msgid "Closing applications (%1/%2, %3)..."
++msgstr "Fermeture des applications (%1/%2, %3)..."
++
++msgid "Terminating services..."
++msgstr "Arrêt des services..."
 diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksplash.po tde-i18n-fr/messages/tdebase/ksplash.po
 --- tde-i18n-fr.ORI/messages/tdebase/ksplash.po	2013-07-26 17:53:39.998658707 +0200
 +++ tde-i18n-fr/messages/tdebase/ksplash.po	2013-07-26 17:53:51.201360190 +0200
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index 531e88003..6f368ba66 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -59,7 +59,7 @@ Patch3:		tde-i18n-14.0.0-fr-openterminalhere.patch
 
 BuildRequires:	findutils
 BuildRequires:	gettext
-BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 %description
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index fd8352cb1..245646319 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -40,7 +40,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-akode-devel
-BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
 
@@ -475,7 +475,7 @@ fi
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --disable-rpath \
+  --enable-rpath \
   --enable-gcc-hidden-visibility \
   \
   --enable-ksayit-audio-plugins \
diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec
index fe3ccfa32..d9b6f29f3 100644
--- a/redhat/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec
@@ -43,13 +43,13 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: trinity-tqt3-devel >= 3.5.0
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: trinity-tdebase-devel >= %{tde_version}
 BuildRequires: trinity-tdegames-devel >= %{tde_version}
 BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
 BuildRequires: trinity-tdepim-devel >= %{tde_version}
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
 
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
@@ -706,7 +706,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --disable-rpath \
+  --enable-rpath \
   --enable-gcc-hidden-visibility \
   \
   --with-extra-includes=%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts \
diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec
index 2059e2000..a653ae691 100644
--- a/redhat/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec
@@ -48,7 +48,7 @@ Source7:		kuserrc
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: rpm-devel
 BuildRequires: pam-devel
@@ -406,7 +406,7 @@ fi
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --disable-rpath \
+  --enable-rpath \
   --enable-gcc-hidden-visibility \
   \
   --with-extra-includes=%{tde_includedir}/tqt \
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index 372dab414..bf3a6e77f 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -682,6 +682,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
diff --git a/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch b/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch
new file mode 100644
index 000000000..d34db88d8
--- /dev/null
+++ b/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch
@@ -0,0 +1,34 @@
+--- trinity-tdebase/twin/data/update_default_rules.cpp.ORI	2013-07-27 11:49:19.337804333 +0200
++++ trinity-tdebase/twin/data/update_default_rules.cpp	2013-07-27 19:12:32.144222960 +0200
+@@ -15,12 +15,18 @@
+ #include <kdebug.h>
+ #include <kinstance.h>
+ #include <kstandarddirs.h>
++#include <tdeaboutdata.h>
++#include <tdecmdlineargs.h>
++#include <tdeglobal.h>
+ 
+ int main( int argc, char* argv[] )
+     {
+     if( argc != 2 )
+         return 1;
+-    TDEInstance inst( "twin_update_default_rules" );
++    TDEAboutData about( "twin_update_default_rules", I18N_NOOP("TWin"), 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ) );
++    TDECmdLineArgs::init( argc, argv, &about );
++    TDEInstance inst( &about );
++    Q_UNUSED( TDEGlobal::locale() ); // jump-start locales to get to translated desriptions
+     TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] );
+     if( file.isEmpty())
+         {
+@@ -43,8 +49,10 @@
+         dest_cfg.setGroup( TQString::number( pos ));
+         for( TQMap< TQString, TQString >::ConstIterator it = entries.begin();
+              it != entries.end();
+-             ++it )
++             ++it ) {
++				 printf("DEBUG: %s\n", it.key().latin1());
+             dest_cfg.writeEntry( it.key(), *it );
++			}
+         }
+     dest_cfg.setGroup( "General" );
+     dest_cfg.writeEntry( "count", pos );
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 70b7ba2ce..89ba7a564 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -279,7 +279,7 @@ Requires:	opensuse-manuals_en
 BuildRequires:	cmake >= 2.8
 BuildRequires:	trinity-tqt3-devel >= 3.5.0
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	make
@@ -393,8 +393,8 @@ BuildRequires:	nas-devel
 BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
 Requires:		dbus-qt >= 0.22-12.EL.9p1
 %else
-BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
-Requires:		trinity-dbus-tqt >= %{tde_version}
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+Requires:		trinity-dbus-tqt >= 1:0.63
 %endif
 
 %if 0%{?fedora} >= 17
@@ -505,10 +505,10 @@ Requires: trinity-libkonq = %{version}-%{release}
 Requires: %{name}-libtqt3-integration = %{version}-%{release}
 Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
  
+Requires:	trinity-tqt3 >= 3.5.0
 Requires:	trinity-tqtinterface >= %{tde_version}
-Requires:	trinity-arts >= %{tde_version}
+Requires:	trinity-arts >= 1:1.5.10
 Requires:	trinity-tdelibs >= %{tde_version}
-Requires:	trinity-tqt3 >= 3.5.0
 Requires:	openssl
 
 
@@ -545,7 +545,9 @@ web browser, X terminal emulator, and many other programs and components.
 Summary:	%{summary} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
+Requires:	trinity-tqtinterface-devel >= %{tde_version}
+Requires:	trinity-arts-devel >= 1:1.5.10
+Requires:	trinity-tdelibs-devel >= %{tde_version}
 
 Requires:	%{name}-bin-devel = %{version}-%{release}
 Requires:	trinity-kate-devel = %{version}-%{release}
@@ -3300,6 +3302,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index 54691f33d..ce30f9601 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -60,7 +60,7 @@ Patch18:	kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-arts-devel >= %{version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
 BuildRequires: trinity-tdelibs-devel >= %{version}
 
 BuildRequires: desktop-file-utils
@@ -1034,7 +1034,7 @@ fi
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --disable-rpath \
+  --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
   --with-extra-includes=%{_includedir}/tqscintilla \
diff --git a/redhat/tdeedu/tdeedu-14.0.0.spec b/redhat/tdeedu/tdeedu-14.0.0.spec
index dedbed5b1..43686086d 100644
--- a/redhat/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/tdeedu/tdeedu-14.0.0.spec
@@ -1343,7 +1343,7 @@ fi
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --disable-rpath \
+  --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
diff --git a/redhat/tdegames/tdegames-14.0.0.spec b/redhat/tdegames/tdegames-14.0.0.spec
index eebb42237..4232e5e6f 100644
--- a/redhat/tdegames/tdegames-14.0.0.spec
+++ b/redhat/tdegames/tdegames-14.0.0.spec
@@ -40,11 +40,11 @@ Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	libtool
 
-BuildRequires:	tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-tqt3-devel >= 3.5.0
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
 
 Obsoletes:		trinity-kdegames < %{version}-%{release}
 Provides:		trinity-kdegames = %{version}-%{release}
@@ -1551,7 +1551,7 @@ fi
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --disable-rpath \
+  --enable-rpath \
   --enable-gcc-hidden-visibility \
   \
   --disable-setgid
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec
index cac2f7085..ab1884dc5 100644
--- a/redhat/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec
@@ -1267,6 +1267,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index d72dfcdf6..6079504d7 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -56,9 +56,9 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	libtool
 BuildRequires:	trinity-tqt3-devel >= 3.5.0
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= %{tde_version}
-BuildRequires:	trinity-dbus-1-tqt-devel >= %{tde_version}
-BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 BuildRequires:	krb5-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	cups-devel
@@ -263,7 +263,7 @@ Requires:		openssl
 # Trinity dependencies
 Requires:		trinity-tqt3 >= 3.5.0
 Requires:		trinity-tqtinterface >= %{tde_version}
-Requires:		trinity-arts >= %{tde_version}
+Requires:		trinity-arts >= 1:1.5.10
 
 
 %description
@@ -365,7 +365,6 @@ kimgio (image manipulation).
 
 %{_sysconfdir}/xdg/menus/tde-applications.menu
 %{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
-%{_sysconfdir}/ld.so.conf.d/trinity.conf
 %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
 %{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service
 
@@ -460,6 +459,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
@@ -509,13 +509,6 @@ cd build
 %__rm -rf "%{?buildroot}"
 %__make install DESTDIR="%{?buildroot}" -C build
 
-%if "%{?tde_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/ld.so.conf.d"
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
-%{tde_libdir}
-EOF
-%endif
-
 # Use system-wide CA certificate
 %if "%{?cacert}" != ""
 %__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch b/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch
index f7f1a21f4..3ca526523 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch
@@ -9,3 +9,14 @@
  
  libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
  
+--- trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am.ORI	2013-08-04 19:15:24.030530158 +0200
++++ trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am	2013-08-04 19:15:32.878625492 +0200
+@@ -31,7 +31,7 @@
+ libartsmodulessynth_la_LIBADD = \
+ 	$(top_builddir)/arts/runtime/libartsbuilder.la \
+ 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
+-	-lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
++	-lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 $(VORBIS_LIBS) $(VORBISFILE_LIBS) -lmad
+ 
+ #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_TDEUI) $(LIB_TDECORE)
+ libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 8a95f9f8a..a4a159e65 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -56,7 +56,7 @@ Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	trinity-tqt3-devel >= 3.5.0
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 %if "%{?_with_akode}" != ""
@@ -1070,7 +1070,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 Summary:	Development files for %{name}, aRts and noatun plugins
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= 3.5.13
+Requires:	trinity-tdelibs-devel >= %{tde_version}
 
 Obsoletes:	trinity-kdemultimedia-devel < %{version}-%{release}
 Provides:	trinity-kdemultimedia-devel = %{version}-%{release}
@@ -1173,7 +1173,7 @@ fi
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --disable-rpath \
+  --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
   --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec
index fd39b982f..d4a02d649 100644
--- a/redhat/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec
@@ -1102,6 +1102,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index faa41871c..5d23b926a 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -49,7 +49,7 @@ Patch14:	kdepim-3.5.13-missing_ldflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-libcaldav-devel
 BuildRequires:	trinity-libcarddav-devel
@@ -2213,6 +2213,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index 7847652d4..9ae49a82d 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -1090,6 +1090,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
diff --git a/redhat/tdetoys/tdetoys-14.0.0.spec b/redhat/tdetoys/tdetoys-14.0.0.spec
index 5f94e820b..0144e23ce 100644
--- a/redhat/tdetoys/tdetoys-14.0.0.spec
+++ b/redhat/tdetoys/tdetoys-14.0.0.spec
@@ -39,7 +39,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake >= 2.8
 BuildRequires: desktop-file-utils
 BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: gettext
 
@@ -396,6 +396,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec
index a67431c26..3065dee08 100644
--- a/redhat/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/tdeutils/tdeutils-14.0.0.spec
@@ -48,8 +48,9 @@ Provides:	trinity-kdeutils-extras = %{version}-%{release}
 Obsoletes:	tdeutils < %{version}-%{release}
 Provides:	tdeutils = %{version}-%{release}
 
+BuildRequires:	cmake >= 2.8
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gettext
@@ -1001,6 +1002,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec
index 446248fa0..082227c11 100644
--- a/redhat/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/tdevelop/tdevelop-14.0.0.spec
@@ -56,7 +56,7 @@ Requires: ctags
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 %if 0%{?rhel} || 0%{?fedora}
@@ -605,6 +605,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec
index 07e5d85c2..8a674eebe 100644
--- a/redhat/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec
@@ -523,7 +523,7 @@ fi
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --disable-rpath \
+  --enable-rpath \
   --disable-gcc-hidden-visibility
 
 # WTF hack for RHEL4