RPM Packaging: update lots of main packages

2 files changed, 43 insertions, 6 deletions

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 \
   \