RHEL/Fedora: fix packaging for base packages, for MGA/MDV

17 files changed, 430 insertions, 403 deletions

diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 04070969d..9982abd3a 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -431,9 +431,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
 update-desktop-database 2> /dev/null || : 
 
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 %post extras
 for f in crystalsvg hicolor ; do
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index e095efe8a..f9b53ff25 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -257,18 +257,27 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libqt3-jni
 %defattr(-,root,root,-)
 %{tde_libdir}/libqtjavasupport.la
-%{tde_libdir}/libqtjavasupport.so
 %{tde_libdir}/libqtjavasupport.so.*
 %{tde_libdir}/jni/libqtjava.la
-%{tde_libdir}/jni/libqtjava.so
 %{tde_libdir}/jni/libqtjava.so.*
 %doc qtjava/ChangeLog
 
-%post -n trinity-libqt3-jni
-/sbin/ldconfig || :
+##########
 
-%postun -n trinity-libqt3-jni
-/sbin/ldconfig || :
+%package -n trinity-libqt3-jni-devel
+Summary:	Development files fo Java bindings for Qt ( Native libraries ) [Trinity]
+Group:		Development/Libraries
+Requires:	trinity-libqt3-jni = %{version}-%{release}
+
+%description -n trinity-libqt3-jni-devel
+This package contains the development files for trinity-libqt3-jni.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libqt3-jni-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libqtjavasupport.so
+%{tde_libdir}/jni/libqtjava.so
 
 ##########
 
@@ -308,12 +317,27 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libtrinity-jni
 %defattr(-,root,root,-)
 %{tde_libdir}/jni/libkdejava.la
-%{tde_libdir}/jni/libkdejava.so
 %{tde_libdir}/jni/libkdejava.so.*
 %doc kdejava/ChangeLog
 
 ##########
 
+%package -n trinity-libtrinity-jni-devel
+Summary:	Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
+Group:		Development/Libraries
+Requires:	trinity-libtrinity-jni = %{version}-%{release}
+
+%description -n trinity-libtrinity-jni-devel
+This package contains the development files for trinity-libtrinity-jni.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libtrinity-jni-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/jni/libkdejava.so
+
+##########
+
 %package -n trinity-libsmokeqt1
 Summary:	SMOKE Binding Library to Qt
 Group:		Environment/Libraries
@@ -854,7 +878,8 @@ Requires:	trinity-libsmokekde-devel = %{version}-%{release}
 Requires:	trinity-libkjsembed-devel = %{version}-%{release}
 Requires:	trinity-libxparts-devel = %{version}-%{release}
 Requires:	trinity-libdcop-c-devel = %{version}-%{release}
-Requires:	trinity-tdebindings-devel = %{version}-%{release}
+Requires:	trinity-libqt3-jni-devel = %{version}-%{release}
+Requires:	trinity-libtrinity-jni-devel = %{version}-%{release}
 
 %description devel
 Development files for the TDE bindings.
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
index 0cfdf0dcc..744c4c8e4 100644
--- a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
@@ -189,9 +189,11 @@ for i in crystalsvg hicolor locolor ; do
 done
 update-desktop-database >& /dev/null ||:
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 
 %files -f %{name}.lang
diff --git a/redhat/kdegames/trinity-kdegames-3.5.12.spec b/redhat/kdegames/trinity-kdegames-3.5.12.spec
index 3cb97f970..148a3c7d2 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.12.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.12.spec
@@ -150,9 +150,11 @@ for f in crystalsvg hicolor ; do
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 
 %files -f %{name}.lang
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
index 512d70952..9e1e07e3b 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
@@ -231,9 +231,11 @@ for f in crystalsvg hicolor ; do
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 %post extras
 /sbin/ldconfig ||:
diff --git a/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch b/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch
deleted file mode 100644
index dcdbd4e99..000000000
--- a/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-commit d3a9d56143cf668c7d29b26a324a424d02036371
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337109016 -0500
-
-    Add the ability to force read-only configuration file access in a TDE application
-    Force kde-config to use read-only access
-    This closes Bug 293
-
-diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp
-index 9ee9dd6..4ad0e5f 100644
---- a/kdecore/kconfigbackend.cpp
-+++ b/kdecore/kconfigbackend.cpp
-@@ -247,17 +247,22 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
-    mfileName = _fileName;
-    resType = _resType;
-    useKDEGlobals = _useKDEGlobals;
--   if (mfileName.isEmpty())
-+   if (mfileName.isEmpty()) {
-       mLocalFileName = TQString::null;
--   else if (!TQDir::isRelativePath(mfileName))
-+   }
-+   else if (!TQDir::isRelativePath(mfileName)) {
-       mLocalFileName = mfileName;
--   else
--      mLocalFileName = KGlobal::dirs()->saveLocation(resType) + mfileName;
-+   }
-+   else {
-+      mLocalFileName = KGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName;
-+   }
- 
--   if (useKDEGlobals)
-+   if (useKDEGlobals) {
-       mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals");
--   else
-+   }
-+   else {
-       mGlobalFileName = TQString::null;
-+   }
- 
-    d->localLastModified = TQDateTime();
-    d->localLastSize = 0;
-diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp
-index 9ad6600..c5c0a4e 100644
---- a/kdecore/kconfigbase.cpp
-+++ b/kdecore/kconfigbase.cpp
-@@ -1139,16 +1139,18 @@ static TQString translatePath( TQString path )
- 
-    // return original path, if it refers to another type of URL (e.g. http:/), or
-    // if the path is already relative to another directory
--   if (!startsWithFile && path[0] != '/' ||
--        startsWithFile && path[5] != '/')
-+   if (((!startsWithFile) && (path[0] != '/')) || (startsWithFile && (path[5] != '/'))) {
- 	return path;
-+   }
- 
--   if (startsWithFile)
-+   if (startsWithFile) {
-         path.remove(0,5); // strip leading "file:/" off the string
-+   }
- 
-    // keep only one single '/' at the beginning - needed for cleanHomeDirPath()
--   while (path[0] == '/' && path[1] == '/')
-+   while (path[0] == '/' && path[1] == '/') {
- 	path.remove(0,1);
-+   }
- 
-    // we can not use KGlobal::dirs()->relativeLocation("home", path) here,
-    // since it would not recognize paths without a trailing '/'.
-diff --git a/kdecore/kinstance.cpp b/kdecore/kinstance.cpp
-index fe0a515..5b3aa86 100644
---- ./kdecore/kinstance.cpp.orig	2011-08-11 04:30:15.000000000 +0200
-+++ ./kdecore/kinstance.cpp	2012-06-19 21:14:21.569741870 +0200
-@@ -70,7 +70,7 @@
-   : _dirs (0L),
-     _config (0L),
-     _iconLoader (0L),
--    _name( name ), _aboutData( new KAboutData( name, "", 0 ) )
-+    _name( name ), _aboutData( new KAboutData( name, "", 0 ) ), m_configReadOnly(false)
- {
-     DEBUG_ADD
-     Q_ASSERT(!name.isEmpty());
-@@ -88,7 +88,7 @@
-   : _dirs (0L),
-     _config (0L),
-     _iconLoader (0L),
--    _name( aboutData->appName() ), _aboutData( aboutData )
-+    _name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false)
- {
-     DEBUG_ADD
-     Q_ASSERT(!_name.isEmpty());
-@@ -107,7 +107,7 @@
-   : _dirs ( src->_dirs ),
-     _config ( src->_config ),
-     _iconLoader ( src->_iconLoader ),
--    _name( src->_name ), _aboutData( src->_aboutData )
-+    _name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false)
- {
-     DEBUG_ADD
-     Q_ASSERT(!_name.isEmpty());
-@@ -174,6 +174,11 @@
- extern bool kde_kiosk_exception;
- extern bool kde_kiosk_admin;
- 
-+void KInstance::setConfigReadOnly(bool ro)
-+{
-+    m_configReadOnly = ro;
-+}
-+
- KConfig	*KInstance::config() const
- {
-     DEBUG_CHECK_ALIVE
-@@ -198,10 +203,12 @@
- 
-         if ( d->sharedConfig == 0 )
-         {
--	    if ( !_name.isEmpty() )
--	        d->sharedConfig = KSharedConfig::openConfig( _name + "rc");
--	    else
-+	    if ( !_name.isEmpty() ) {
-+	        d->sharedConfig = KSharedConfig::openConfig( _name + "rc", m_configReadOnly );
-+	    }
-+	    else {
- 	        d->sharedConfig = KSharedConfig::openConfig( TQString::null );
-+	    }
- 	}
- 	
- 	// Check if we are excempt from kiosk restrictions
-@@ -211,7 +218,7 @@
-             d->sharedConfig = 0;
-             return config(); // Reread...
-         }
--	
-+
- 	_config = d->sharedConfig;
-         if (_dirs)
-             if (_dirs->addCustomized(_config))
-diff --git a/kdecore/kinstance.h b/kdecore/kinstance.h
-index 75cc4b4..444a2d8 100644
---- a/kdecore/kinstance.h
-+++ b/kdecore/kinstance.h
-@@ -69,7 +69,7 @@ class kdecore_EXPORT KInstance
-      * Only for K(Unique)Application
-      * Initialize from src and delete it.
-      */
--     
-+
-     KInstance( KInstance* src );
- 
-     /**
-@@ -96,6 +96,14 @@ class kdecore_EXPORT KInstance
-     KSharedConfig      *sharedConfig() const;
- 
-     /**
-+     * Set a read-only flag on the configuration files
-+     * This must be called before config() or dirs() to have any effect
-+     * Defaults to FALSE
-+     * @param ro read only if TRUE
-+     */
-+    void                setConfigReadOnly(bool ro);
-+
-+    /**
-      *  Returns an iconloader object.
-      * @return the iconloader object.
-      */
-@@ -162,6 +170,7 @@ protected:
-     virtual void virtual_hook( int id, void* data );
- private:
-     KInstancePrivate *d;
-+    bool m_configReadOnly;
- };
- 
- #endif
-diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
-index bce4bf4..bb8ae97 100644
---- a/kdecore/kstandarddirs.cpp.orig	2011-08-21 06:15:32.000000000 +0200
-+++ b/kdecore/kstandarddirs.cpp	2012-06-19 21:17:34.550007910 +0200
-@@ -451,13 +450,17 @@
- bool KStandardDirs::exists(const TQString &fullPath)
- {
-     KDE_struct_stat buff;
--    if (access(TQFile::encodeName(fullPath), R_OK) == 0 && KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)
-+    if ((access(TQFile::encodeName(fullPath), R_OK) == 0) && (KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)) {
- 	if (fullPath.tqat(fullPath.length() - 1) != QChar('/')) {
- 	    if (S_ISREG( buff.st_mode ))
- 		return true;
--	} else
--	    if (S_ISDIR( buff.st_mode ))
-+	}
-+	else {
-+	    if (S_ISDIR( buff.st_mode )) {
- 		return true;
-+	    }
-+	}
-+    }
-     return false;
- }
- 
-@@ -767,17 +770,23 @@
-          srv = findExe(TQString::tqfromLatin1("lnusertemp"));
-       if (!srv.isEmpty())
-       {
--         system(TQFile::encodeName(srv)+" "+type);
--         result = readlink(TQFile::encodeName(dir).data(), link, 1023);
-+         if (system(TQFile::encodeName(srv)+" "+type) < 0 ) {
-+             result = readlink(TQFile::encodeName(dir).data(), link, 1023);
-+         }
-+         else {
-+             result = -1;
-+         }
-       }
-    }
-    if (result > 0)
-    {
-       link[result] = 0;
--      if (link[0] == TQChar('/').latin1())
-+      if (link[0] == TQChar('/').latin1()) {
-          dir = TQFile::decodeName(link);
--      else
-+      }
-+      else {
-          dir = TQDir::cleanDirPath(dir+TQFile::decodeName(link));
-+      }
-    }
- #endif
-    addResourceDir(type, dir+QChar('/'));
-@@ -1139,8 +1148,9 @@
- 	}
-         dircache.remove(type);
-     }
--    if (!fullPath.endsWith("/"))
-+    if (!fullPath.endsWith("/")) {
- 	    fullPath += "/";
-+    }
-     return fullPath;
- }
- 
-diff --git a/kdecore/kde-config.cpp.in b/kdecore/kde-config.cpp.in
-index 90c5dae..c988b00 100644
---- a/kdecore/kde-config.cpp.in
-+++ b/kdecore/kde-config.cpp.in
-@@ -120,6 +120,7 @@ int main(int argc, char **argv)
-     KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
- 
-     KInstance a("kde-config");
-+    a.setConfigReadOnly(TRUE);
-     (void)KGlobal::dirs(); // trigger the creation
-     (void)KGlobal::config();
- 
diff --git a/redhat/kdelibs/tdelibs-r14.spec b/redhat/kdelibs/tdelibs-r14.spec
index 0dbf4a796..d57bea3a6 100755
--- a/redhat/kdelibs/tdelibs-r14.spec
+++ b/redhat/kdelibs/tdelibs-r14.spec
@@ -174,9 +174,11 @@ EOF
 %__rm -rf %{?buildroot}
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
 
 
 %files
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index 7732731f0..4c31bba3e 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
@@ -190,9 +190,11 @@ EOF
 %__rm -rf %{?buildroot}
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
 
 
 %files
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13-sru.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13-sru.spec
new file mode 100755
index 000000000..46c1d7619
--- /dev/null
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13-sru.spec
@@ -0,0 +1,330 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+Name:		trinity-tdelibs
+Version:	3.5.13.1
+Release:	0%{?dist}%{?_variant}
+License:	GPL
+Summary:	TDE Libraries
+Group:		Environment/Libraries
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	kdelibs-3.5.13.tar.gz
+# [tdelibs] Diff between 3.5.13-stable and 3.5.13-sru
+Patch0:		tdelibs-3.5.13-sru-20120805.patch
+
+Obsoletes:	tdelibs < %{version}-%{release}
+Provides:	tdelibs = %{version}-%{release}
+Obsoletes:	trinity-kdelibs < %{version}-%{release}
+Provides:	trinity-kdelibs = %{version}-%{release}
+Obsoletes:	trinity-kdelibs-apidocs < %{version}-%{release}
+Provides:	trinity-kdelibs-apidocs = %{version}-%{release}
+
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	libtool
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-arts-devel
+BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
+BuildRequires:	libutempter-devel
+BuildRequires:	bzip2-devel
+BuildRequires:	openssl-devel
+BuildRequires:	gcc-c++
+BuildRequires:	alsa-lib-devel
+BuildRequires:	libidn-devel
+BuildRequires:	qt3-devel
+BuildRequires:	jasper-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gamin-devel
+BuildRequires:	aspell-devel
+BuildRequires:	hspell-devel
+BuildRequires:	avahi-tqt-devel >= 3.5.13
+# LUA support are not ready yet
+#BuildRequires:	lua-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}avahi-client-devel
+BuildRequires:	%{_lib}ltdl-devel
+BuildRequires:	x11-proto-devel
+BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
+Requires:		%{_lib}avahi-client3
+%else
+BuildRequires:	avahi-devel
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:	xorg-x11-proto-devel
+BuildRequires:	libXcomposite-devel
+%endif
+
+Requires:		tqtinterface >= 3.5.13
+Requires:		trinity-arts >= 3.5.13
+Requires:		avahi
+Requires:		qt3 >= 3.3.8.d
+
+%description
+Libraries for the Trinity Desktop Environment:
+TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
+kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
+kspell (spelling checker), jscript (javascript), kab (addressbook),
+kimgio (image manipulation).
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
+%{tde_bindir}/artsmessage
+%{tde_bindir}/cupsdconf
+%{tde_bindir}/cupsdoprint
+%{tde_bindir}/dcop
+%{tde_bindir}/dcopclient
+%{tde_bindir}/dcopfind
+%{tde_bindir}/dcopobject
+%{tde_bindir}/dcopquit
+%{tde_bindir}/dcopref
+%{tde_bindir}/dcopserver
+%{tde_bindir}/dcopserver_shutdown
+%{tde_bindir}/dcopstart
+%{tde_bindir}/filesharelist
+%{tde_bindir}/fileshareset
+%{tde_bindir}/imagetops
+%{tde_bindir}/kab2kabc
+%{tde_bindir}/kaddprinterwizard
+%{tde_bindir}/kbuildsycoca
+%{tde_bindir}/kcmshell
+%{tde_bindir}/kconf_update
+%{tde_bindir}/kcookiejar
+%{tde_bindir}/kde-config
+%{tde_bindir}/kde-menu
+%{tde_bindir}/kded
+%{tde_bindir}/kdeinit
+%{tde_bindir}/kdeinit_shutdown
+%{tde_bindir}/kdeinit_wrapper
+%{tde_bindir}/kdesu_stub
+%{tde_bindir}/kdontchangethehostname
+%{tde_bindir}/kdostartupconfig
+%{tde_bindir}/kfile
+%{tde_bindir}/kfmexec
+%{tde_bindir}/khotnewstuff
+%{tde_bindir}/kinstalltheme
+%{tde_bindir}/kio_http_cache_cleaner
+%{tde_bindir}/kio_uiserver
+%{tde_bindir}/kioexec
+%{tde_bindir}/kioslave
+%{tde_bindir}/klauncher
+%{tde_bindir}/kmailservice
+%{tde_bindir}/kmimelist
+%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
+%{tde_bindir}/ksendbugmail
+%{tde_bindir}/kshell
+%{tde_bindir}/kstartupconfig
+%{tde_bindir}/ktelnetservice
+%{tde_bindir}/ktradertest
+%{tde_bindir}/kwrapper
+%{tde_bindir}/lnusertemp
+%{tde_bindir}/make_driver_db_cups
+%{tde_bindir}/make_driver_db_lpr
+%{tde_bindir}/meinproc
+%{tde_bindir}/networkstatustestservice
+%{tde_bindir}/start_kdeinit
+%{tde_bindir}/start_kdeinit_wrapper
+%attr(4755,root,root) %{tde_bindir}/kgrantpty
+%{tde_tdelibdir}/*
+%{tde_libdir}/lib*.so.*
+%{tde_libdir}/lib[kt]deinit_*.la
+%{tde_libdir}/lib[kt]deinit_*.so
+%{tde_datadir}/applications/kde/*.desktop
+%{tde_datadir}/autostart/kab2kabc.desktop
+%{tde_datadir}/applnk/kio_iso.desktop
+%{tde_datadir}/apps/*
+%exclude %{tde_datadir}/apps/ksgmltools2/
+%config(noreplace) %{tde_datadir}/config/*
+%{tde_datadir}/emoticons/*
+%{tde_datadir}/icons/default.kde
+%{tde_datadir}/mimelnk/magic
+%{tde_datadir}/mimelnk/*/*.desktop
+%{tde_datadir}/services/*
+%{tde_datadir}/servicetypes/*
+%{tde_datadir}/icons/crystalsvg/
+%{tde_tdedocdir}/HTML/en/kspell/
+# remove conflicts with kdelibs-4
+%if "%{?tde_prefix}" != "/usr"
+%{tde_bindir}/checkXML
+%{tde_bindir}/ksvgtopng
+%{tde_bindir}/kunittestmodrunner
+%{tde_bindir}/preparetips
+%{tde_datadir}/icons/hicolor/index.theme
+%{tde_datadir}/locale/all_languages
+%{tde_tdedocdir}/HTML/en/common/*
+%{_sysconfdir}/ld.so.conf.d/trinity.conf
+%else
+%exclude %{tde_bindir}/checkXML
+%exclude %{tde_bindir}/ksvgtopng
+%exclude %{tde_bindir}/kunittestmodrunner
+%exclude %{tde_bindir}/preparetips
+%exclude %{tde_datadir}/config/colors
+%exclude %{tde_datadir}/config/kdebug.areas
+%exclude %{tde_datadir}/config/kdebugrc
+%exclude %{tde_datadir}/config/ksslcalist
+%exclude %{tde_datadir}/config/ui/ui_standards.rc
+%exclude %{tde_datadir}/icons/hicolor/index.theme
+%exclude %{tde_datadir}/locale/all_languages
+%exclude %{tde_tdedocdir}/HTML/en/common/*
+%endif
+
+# Avoid conflict with 'redhat-menus' package
+%if "%{tde_prefix}" == "/usr"
+%{_sysconfdir}/xdg/menus/kde-applications.menu
+%else
+%{tde_prefix}/etc/xdg/menus/kde-applications.menu
+%endif
+
+# New in TDE 3.5.13
+%{tde_bindir}/kdetcompmgr
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+##########
+
+%package devel
+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}
+
+%description devel
+This package includes the header files you will need to compile
+applications for TDE.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/dcopidl*
+%{tde_bindir}/kconfig_compiler
+%{tde_bindir}/makekdewidgets
+%{tde_datadir}/apps/ksgmltools2/
+%{tde_tdeincludedir}/*
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/*.a
+%exclude %{tde_libdir}/libkdeinit_*.la
+%exclude %{tde_libdir}/libkdeinit_*.so
+
+# New in TDE 3.5.13
+%{tde_datadir}/cmake/kdelibs.cmake
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
+
+%prep
+%setup -q -n kdelibs
+%patch0 -p1
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
+
+# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
+export LD_LIBRARY_PATH="%{tde_libdir}"
+
+
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DDOC_INSTALL_DIR=%{tde_docdir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
+  -DWITH_ARTS=ON \
+  -DWITH_ALSA=ON \
+  -DWITH_LIBART=ON \
+  -DWITH_LIBIDN=ON \
+  -DWITH_SSL=ON \
+  -DWITH_CUPS=ON \
+  -DWITH_LUA=OFF \
+  -DWITH_TIFF=ON \
+  -DWITH_JASPER=ON \
+  -DWITH_OPENEXR=ON \
+  -DWITH_UTEMPTER=ON \
+  -DWITH_AVAHI=ON \
+  -DWITH_ASPELL=ON \
+  -DWITH_HSPELL=ON \
+  -DWITH_PCRE=ON \
+  -DWITH_INOTIFY=ON \
+  -DWITH_GAMIN=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__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
+
+# Moves the XDG configuration files to TDE directory
+%if "%{tde_prefix}" != "/usr"
+%__install -p -D -m644 \
+	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
+	"%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu"
+%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
+%else
+%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
+%endif
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%changelog
+* Sun Aug 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-0
+- Initial SRU build
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
index 82e4df87f..e7dd20564 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
@@ -235,13 +235,17 @@ for f in crystalsvg hicolor locolor ; do
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
-%post extras-libs -p /sbin/ldconfig
+%post extras-libs
+/sbin/ldconfig
 
-%postun extras-libs -p /sbin/ldconfig
+%postun extras-libs
+/sbin/ldconfig
 
 %post extras
 /sbin/ldconfig
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-missing_ldflags.patch b/redhat/kdenetwork/kdenetwork-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..88d7fd0f1
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-missing_ldflags.patch
@@ -0,0 +1,10 @@
+--- kdenetwork/wifi/CMakeLists.txt.ldflags	2011-10-29 04:43:38.000000000 +0200
++++ kdenetwork/wifi/CMakeLists.txt	2012-08-08 15:14:31.956605213 +0200
+@@ -21,6 +21,7 @@
+   ${CMAKE_BINARY_DIR}
+   ${TDE_INCLUDE_DIR}
+   ${TQT_INCLUDE_DIRS}
++  ${ARTS_INCLUDE_DIRS}/..
+ )
+ 
+ link_directories(
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-use_libv4l_or_libv4l1.patch b/redhat/kdenetwork/kdenetwork-3.5.13-use_libv4l_or_libv4l1.patch
deleted file mode 100644
index 9d9d55344..000000000
--- a/redhat/kdenetwork/kdenetwork-3.5.13-use_libv4l_or_libv4l1.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-commit d8cbbab802a063679a4db5cebc73122cdb1da100
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1343324022 -0500
-
-    Use libv4l if available, otherwise check for v4l1 headers
-
-diff --git a/kopete/ConfigureChecks.cmake b/kopete/ConfigureChecks.cmake
-index aece436..70e97f5 100644
---- a/kopete/ConfigureChecks.cmake
-+++ b/kopete/ConfigureChecks.cmake
-@@ -26,3 +26,10 @@ if ( HAVE_LIBV4L1_VIDEODEV_H )
- endif ( )
- # -- End libv4l1-videodev.h ----------------------------------------------
- 
-+# -- Check for linux/videodev.h presence --------------------
-+CHECK_INCLUDE_FILE ( "linux/videodev.h" HAVE_LINUX_VIDEODEV_H )
-+if ( HAVE_LINUX_VIDEODEV_H )
-+  add_definitions( -DHAVE_LINUX_VIDEODEV_H )
-+endif ( )
-+# -- End linux-videodev.h ----------------------------------------------
-+
-diff --git a/kopete/libkopete/avdevice/videocontrol.h b/kopete/libkopete/avdevice/videocontrol.h
-index c4db3b9..dbef6b5 100644
---- a/kopete/libkopete/avdevice/videocontrol.h
-+++ b/kopete/libkopete/avdevice/videocontrol.h
-@@ -15,8 +15,6 @@
-     *************************************************************************
- */
- 
--#define ENABLE_AV
--
- #ifndef KOPETE_AVVIDEOCONTROL_H
- #define KOPETE_AVVIDEOCONTROL_H
- 
-diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp
-index ea23544..e12fb02 100644
---- a/kopete/libkopete/avdevice/videodevice.cpp
-+++ b/kopete/libkopete/avdevice/videodevice.cpp
-@@ -15,8 +15,6 @@
-     *************************************************************************
- */
- 
--#define ENABLE_AV
--
- #include <cstdlib>
- #include <cerrno>
- #include <cstring>
-diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h
-index 7bba507..7e57513 100644
---- a/kopete/libkopete/avdevice/videodevice.h
-+++ b/kopete/libkopete/avdevice/videodevice.h
-@@ -15,11 +15,11 @@
-     *************************************************************************
- */
- 
--#define ENABLE_AV
--
- #ifndef KOPETE_AVVIDEODEVICELISTITEM_H
- #define KOPETE_AVVIDEODEVICELISTITEM_H
- 
-+#define ENABLE_AV
-+
- #if defined HAVE_CONFIG_H
- #include <config.h>
- #endif
-@@ -54,8 +54,10 @@
- #include <linux/kernel.h>
- #if defined(HAVE_LIBV4L1_VIDEODEV_H)
- #include <libv4l1-videodev.h>
--#else
-+#elif defined(HAVE_LINUX_VIDEODEV_H)
- #include <linux/videodev.h>
-+#else
-+#undef ENABLE_AV
- #endif
- #define VIDEO_MODE_PAL_Nc  3
- #define VIDEO_MODE_PAL_M   4
-@@ -293,8 +295,10 @@ public:
- void enumerateMenu (void);
- 
- #endif
-+#ifndef ENABLE_AV
- 	struct video_capability V4L_capabilities;
- 	struct video_buffer V4L_videobuffer;
-+#endif
- #endif	
- 	TQValueVector<Kopete::AV::VideoInput> m_input;
- 	TQValueVector<Kopete::AV::VideoControl> m_control;
-diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp
-index b725d5d..cbfe7cb 100644
---- a/kopete/libkopete/avdevice/videodevicepool.cpp
-+++ b/kopete/libkopete/avdevice/videodevicepool.cpp
-@@ -15,8 +15,6 @@
-     *************************************************************************
- */
- 
--#define ENABLE_AV
--
- #include <assert.h>
- #include <cstdlib>
- #include <cerrno>
-diff --git a/kopete/libkopete/avdevice/videoinput.h b/kopete/libkopete/avdevice/videoinput.h
-index 9fc109a..dd7504f 100644
---- a/kopete/libkopete/avdevice/videoinput.h
-+++ b/kopete/libkopete/avdevice/videoinput.h
-@@ -15,8 +15,6 @@
-     *************************************************************************
- */
- 
--#define ENABLE_AV
--
- #ifndef KOPETE_AVVIDEOINPUT_H
- #define KOPETE_AVVIDEOINPUT_H
- 
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
index 8f7a72611..7ef987e99 100644
--- a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
@@ -290,9 +290,11 @@ if [ $1 -eq 0 ]; then
   /sbin/service lisa stop > /dev/null 2>&1 ||:
 fi
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 %post extras
 for f in crystalsvg hicolor ; do
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
index 7458317d2..ded3104de 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
@@ -188,9 +188,11 @@ for f in crystalsvg hicolor locolor ; do
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 
 %files
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
index 6d5ee5cde..b28a83ac8 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
@@ -52,7 +52,7 @@ BuildRequires: trinity-tdelibs-devel
 # for kbugbuster/libkcal
 BuildRequires: trinity-tdepim-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}db5.1-devel
+#BuildRequires:	%{_lib}db4.8-devel
 %else
 BuildRequires: db4-devel
 %endif
@@ -345,7 +345,7 @@ This package contains the KBabel development files.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kbabel-devel
-%{tde_includedir}/kbabel/
+%{tde_tdeincludedir}/kbabel/
 %{tde_libdir}/libkbabelcommon.la
 %{tde_libdir}/libkbabelcommon.so
 %{tde_libdir}/libkbabeldictplugin.la
@@ -505,7 +505,7 @@ Included are:
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files misc
-%{tde_includedir}/kprofilemethod.h
+%{tde_tdeincludedir}/kprofilemethod.h
 %{tde_tdelibdir}/kabcformat_kdeaccounts.la
 %{tde_tdelibdir}/kabcformat_kdeaccounts.so
 %{tde_tdelibdir}/scheck.so
@@ -716,7 +716,7 @@ loaded dynamically using KLibLoader.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kspy
-%{tde_includedir}/kspy.h
+%{tde_tdeincludedir}/kspy.h
 %{tde_libdir}/libkspy.la
 %{tde_libdir}/libkspy.so
 %{tde_libdir}/libkspy.so.*
@@ -822,9 +822,9 @@ Development files for libcvsservice are included in this package.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-libcvsservice-devel
-%{tde_includedir}/cvsjob_stub.h
-%{tde_includedir}/cvsservice_stub.h
-%{tde_includedir}/repository_stub.h
+%{tde_tdeincludedir}/cvsjob_stub.h
+%{tde_tdeincludedir}/cvsservice_stub.h
+%{tde_tdeincludedir}/repository_stub.h
 %{tde_libdir}/libcvsservice.la
 %{tde_libdir}/libcvsservice.so
 %{tde_libdir}/lib[kt]deinit_cvsaskpass.la
@@ -1003,7 +1003,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_libdir}/libkunittestgui.la
 %{tde_libdir}/libkunittestgui.so
 #%{tde_libdir}/libkunittestgui.so.*
-%{tde_includedir}/kunittest/runnergui.h
+%{tde_tdeincludedir}/kunittest/runnergui.h
 
 %post -n trinity-kunittest
 /sbin/ldconfig || :
@@ -1053,7 +1053,7 @@ cd build
 
 %cmake \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
   -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
index 6d963ec74..de36a42ff 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
@@ -205,9 +205,11 @@ for f in hicolor locolor ; do
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 
 %clean
diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec
index b1c69f526..9dcec5cd7 100644
--- a/redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec
+++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec
@@ -176,9 +176,11 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 
 %clean