RPM: merge redhat directory with master branch

5 files changed, 184 insertions, 76 deletions

diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 4071cb33c..2a7aa0446 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdelibs (version R14.0.0)
+# spec file for package tdelibs (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,10 +21,13 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg tdelibs
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -34,15 +37,10 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 
 Name:			trinity-%{tde_pkg}
 Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		TDE Libraries
 Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
@@ -60,7 +58,10 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		trinity-tdelibs-rpmlintrc
+Source1:		%{name}-rpmlintrc
+
+Patch0:			tdelibs-14.0.1.patch
+Patch1:			tdelibs-14.1.0.patch
 
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
@@ -83,7 +84,10 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 
 Requires:		trinity-arts >= %{tde_epoch}:1.5.10
 Requires:		trinity-filesystem >= %{tde_version}
+%if 0%{?mgaversion} >= 6
+%else
 Requires:		fileshareset >= 2.0
+%endif
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
@@ -121,6 +125,9 @@ BuildRequires:	libtiff-devel
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# ACL support
+BuildRequires:	libacl-devel
+
 # GLIB2 support
 BuildRequires:	glib2-devel
 
@@ -160,7 +167,10 @@ BuildRequires:	bzip2-devel
 %endif
 
 # UTEMPTER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}utempter-devel
+%endif
+%if 0%{?rhel} >=5 || 0%{?fedora}
 BuildRequires:	libutempter-devel
 %endif
 %if 0%{?rhel} == 4
@@ -171,13 +181,13 @@ BuildRequires:	utempter-devel
 %endif
 
 # HSPELL support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_hspell 1
 BuildRequires:	hspell-devel
 %endif
 
 # JASPER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_jasper 1
 %if 0%{?suse_version}
 BuildRequires:	libjasper-devel
@@ -205,9 +215,12 @@ Requires:		avahi
 %endif
 
 # OPENEXR support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_openexr 1
 BuildRequires:	OpenEXR-devel
+%if 0%{?pclinuxos}
+BuildRequires:  libpthread-stubs
+%endif
 %endif
 
 # LIBTOOL
@@ -253,15 +266,25 @@ BuildRequires:	xz-devel
 %endif
 
 # Certificates support
-%if 0%{?fedora} == 18 || 0%{?fedora} == 19
-%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
+%if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+%endif
+%if 0%{?fedora} == 18 || 0%{?fedora} == 19
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+Requires:		rootcerts
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+%else
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
 Requires:		openssl
 %endif
+%endif
 %if 0%{?rhel} == 5
 %define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 Requires:		openssl
@@ -298,16 +321,15 @@ Requires:		%{cacert}
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %define xt_devel libXt-devel
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define xt_devel libxt-devel
+%endif
 %{?xt_devel:BuildRequires: %{xt_devel}}
 
 ### New features in TDE R14
 
 # LIBMAGIC support
-%if 0%{?rhel} == 5
-BuildRequires:	file
-%else
 BuildRequires:	file-devel
-%endif
 
 # NETWORKMANAGER support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
@@ -336,10 +358,12 @@ BuildRequires:	libudev-devel
 
 # UDISKS support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
+%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310
 %define with_udisks 1
 BuildRequires:	udisks-devel
 Requires:		udisks
 %endif
+%endif
 
 # PMOUNT support
 #Requires:		pmount
@@ -350,8 +374,12 @@ Requires:		udisks
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:	libudisks2-devel
 %else
+%if 0%{?suse_version} >= 1550
+BuildRequires:	libudisks2-0-devel
+%else
 BuildRequires:	udisks2-devel
 %endif
+%endif
 Requires:		udisks2
 %endif
 
@@ -372,6 +400,43 @@ Requires:		upower
 %define with_systemd 1
 %endif
 
+# PCSCLITE support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}pcsclite-devel
+%else
+BuildRequires:	pcsc-lite-devel
+%endif
+
+# PKCS11 support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}pkcs11-helper-devel
+%else
+BuildRequires:	pkcs11-helper-devel
+%endif
+
+# OPENSC support
+BuildRequires:	opensc
+
+# CRYPTSETUP support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}cryptsetup-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libcryptsetup-devel
+%endif
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+BuildRequires:	cryptsetup-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+BuildRequires:	cryptsetup-luks-devel
+%endif
+
+# ELFICON support
+%if 0
+%define with_elficon 1
+BuildRequires:		libr-devel >= 0.6.0
+%endif
+
 
 %description
 Libraries for the Trinity Desktop Environment:
@@ -452,7 +517,6 @@ kimgio (image manipulation).
 %{tde_datadir}/applnk/tdeio_iso.desktop
 %{tde_datadir}/apps/*
 %exclude %{tde_datadir}/apps/ksgmltools2/
-%{tde_datadir}/config/*
 %{tde_datadir}/emoticons/*
 %{tde_datadir}/icons/crystalsvg/
 %{tde_datadir}/icons/default.tde
@@ -464,6 +528,9 @@ kimgio (image manipulation).
 %{tde_tdedocdir}/HTML/en/common/*
 %{tde_tdedocdir}/HTML/en/tdespell/
 
+# Global Trinity configuration
+%config %{tde_confdir}
+
 # Some setuid binaries need special care
 %if 0%{?suse_version}
 %verify(not mode) %{tde_bindir}/kgrantpty
@@ -492,8 +559,6 @@ if [ -d "%{tde_datadir}/locale/all_languages" ]; then
 fi
 
 %post
-/sbin/ldconfig || :
-
 %if 0%{?suse_version}
 # Sets permissions on setuid files (openSUSE specific)
 %set_permissions %{tde_bindir}/kgrantpty
@@ -501,9 +566,6 @@ fi
 %set_permissions %{tde_bindir}/start_tdeinit
 %endif
 
-%postun
-/sbin/ldconfig || :
-
 ##########
 
 %package devel
@@ -542,12 +604,6 @@ applications for TDE.
 %{tde_datadir}/cmake/tdelibs.cmake
 %{tde_libdir}/pkgconfig/tdelibs.pc
 
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -558,6 +614,15 @@ applications for TDE.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
+%patch1 -p1 -b .ftbfs
+
+# RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings
+%if 0%{?rhel} == 5
+%__sed -i "tdecore/kinstance.h" \
+       -i "tdecore/tdeglobal.h" \
+       -e "/#ifdef __TDE_HAVE_TDEHWLIB/,/#endif/d"
+%endif
 
 
 %build
@@ -588,6 +653,7 @@ fi
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   -DDOC_INSTALL_DIR="%{tde_docdir}" \
   -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
@@ -606,8 +672,8 @@ fi
   %{?!with_jasper:-DWITH_JASPER=OFF} \
   %{?!with_openexr:-DWITH_OPENEXR=OFF} \
   -DWITH_UTEMPTER=ON \
-  %{?!with_elficon:-DWITH_ELFICON=OFF} \
   %{?!with_avahi:-DWITH_AVAHI=OFF} \
+  %{?!with_elficon:-DWITH_ELFICON=OFF} \
   %{?!with_pcre:-DWITH_PCRE=OFF} \
   %{?!with_inotify:-DWITH_INOTIFY=OFF} \
   %{?!with_gamin:-DWITH_GAMIN=OFF} \
@@ -619,10 +685,14 @@ fi
   %{?!with_upower:-DWITH_UPOWER=OFF} \
   %{?!with_udisks:-DWITH_UDISKS=OFF} \
   %{?!with_udisks2:-DWITH_UDISKS2=OFF} \
+  -DWITH_UDEVIL=OFF \
   -DWITH_CONSOLEKIT=ON \
   %{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \
   -DWITH_SUDO_TDESU_BACKEND=OFF \
   -DWITH_OLD_XDG_STD=OFF \
+  -DWITH_PCSC=ON \
+  -DWITH_PKCS=ON \
+  -DWITH_CRYPTSETUP=ON \
   %{?!with_lzma:-DWITH_LZMA=OFF} \
   -DWITH_LIBBFD=OFF \
   %{?!with_xrandr:-DWITH_XRANDR=OFF} \
@@ -679,5 +749,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.patch b/redhat/main/tdelibs/tdelibs-14.0.1.patch
new file mode 100644
index 000000000..ab309f841
--- /dev/null
+++ b/redhat/main/tdelibs/tdelibs-14.0.1.patch
@@ -0,0 +1,31 @@
+diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h
+index b5fddb8..1269c36 100644
+--- a/tdecore/tdeglobal.h
++++ b/tdecore/tdeglobal.h
+@@ -25,8 +25,10 @@ class KCharsets;
+ class TDEConfig;
+ class TDESharedConfig;
+ class TDEIconLoader;
++#ifdef __TDE_HAVE_TDEHWLIB
+ class TDEHardwareDevices;
+ class TDEGlobalNetworkManager;
++#endif
+ class TDELocale;
+ class TDEStandardDirs;
+ class KStaticDeleterBase;
+@@ -79,6 +81,7 @@ public:
+      */
+     static TDEIconLoader	        *iconLoader();
+ 
++#ifdef __TDE_HAVE_TDEHWLIB
+     /**
+      *  Returns a TDEHardwareDevices object.
+      * @return the global hardware devices object
+@@ -90,6 +93,7 @@ public:
+      * @return the global network manager object
+      */
+     static TDEGlobalNetworkManager   *networkManager();
++#endif
+ 
+     /**
+      * Returns the global locale object.
diff --git a/redhat/main/tdelibs/tdelibs-14.1.0.patch b/redhat/main/tdelibs/tdelibs-14.1.0.patch
new file mode 100644
index 000000000..c4812b447
--- /dev/null
+++ b/redhat/main/tdelibs/tdelibs-14.1.0.patch
@@ -0,0 +1,13 @@
+diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
+index 4d9c4a4..fed951b 100644
+--- a/tdecore/CMakeLists.txt
++++ b/tdecore/CMakeLists.txt
+@@ -137,7 +137,7 @@ tde_add_library( ${target} SHARED AUTOMOC
+   EMBED tdecorenetwork-static ${TDEHW_LIB}
+   LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
+     ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
+-    ${LIBBFD_LIBRARIES} ${LIB_UTIL}
++    ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${SSL_LIBRARIES}
+   DEPENDENCIES dcopidl dcopidl2cpp
+   DESTINATION ${LIB_INSTALL_DIR}
+ )
diff --git a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
index 61cbf5344..7775f4908 100644
--- a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -29,20 +29,18 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 
 Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
 Version:		%{tde_version}
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		TDE Libraries
 Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
@@ -62,6 +60,8 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		trinity-tdelibs-rpmlintrc
 
+%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
+
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs < %{version}-%{release}
@@ -95,6 +95,11 @@ BuildRequires:	fdupes
 BuildRequires:	update-desktop-files
 %endif
 
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 # KRB5 support
 BuildRequires:	krb5-devel
 
@@ -166,21 +171,18 @@ BuildRequires:	utempter-devel
 %endif
 
 # HSPELL support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_hspell 1
 BuildRequires:	hspell-devel
 %endif
 
 # JASPER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_jasper 1
 %if 0%{?suse_version}
 BuildRequires:	libjasper-devel
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	jasper-devel
 %endif
 %endif
@@ -190,7 +192,7 @@ BuildRequires:	jasper-devel
 %define with_avahi 1
 BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
+BuildRequires:	avahi-client-devel
 Requires:		%{_lib}avahi-client3
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@@ -200,7 +202,7 @@ Requires:		avahi
 %endif
 
 # OPENEXR support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_openexr 1
 BuildRequires:	OpenEXR-devel
 %endif
@@ -208,7 +210,7 @@ BuildRequires:	OpenEXR-devel
 # LIBTOOL
 BuildRequires:	libtool
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
+BuildRequires:	libltdl-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libtool-ltdl-devel
@@ -240,7 +242,7 @@ Requires:		xorg-x11
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
 %define with_lzma 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}lzma-devel
+BuildRequires:	liblzma-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	xz-devel
@@ -248,12 +250,12 @@ BuildRequires:	xz-devel
 %endif
 
 # Certificates support
-%if 0%{?rhel} >= 6 || 0%{?fedora}
+%if 0%{?fedora} == 18 || 0%{?fedora} == 19
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
 Requires:		openssl
 %endif
@@ -266,6 +268,9 @@ Requires:		openssl
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
+%if "%{cacert}" != ""
+Requires:		%{cacert}
+%endif
 
 # XRANDR support
 #  On RHEL5, xrandr library is too old.
@@ -276,7 +281,7 @@ Requires:		ca-certificates
 # XCOMPOSITE support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mgaversion} >= 4
-%define xcomposite_devel %{_lib}xcomposite-devel
+%define xcomposite_devel libxcomposite-devel
 %else
 %define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
 %endif
@@ -290,10 +295,12 @@ Requires:		ca-certificates
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %define xt_devel libXt-devel
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define xt_devel libxt-devel
+%endif
 %{?xt_devel:BuildRequires: %{xt_devel}}
 
 
-
 %description
 Libraries for the Trinity Desktop Environment:
 TDE Libraries included: tdecore (TDE core library), tdeui (user interface),
@@ -419,12 +426,12 @@ fi
 %package devel
 Summary:	TDE Libraries (Development files)
 Group:		Development/Libraries/X11
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{tde_epoch}:%{version}-%{release}
 
-Obsoletes:	tdelibs-devel < %{version}-%{release}
-Provides:	tdelibs-devel = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{version}-%{release}
+Obsoletes:	tdelibs-devel < %{tde_epoch}:%{version}-%{release}
+Provides:	tdelibs-devel = %{tde_epoch}:%{version}-%{release}
+Obsoletes:	trinity-kdelibs-devel < %{tde_epoch}:%{version}-%{release}
+Provides:	trinity-kdelibs-devel = %{tde_epoch}:%{version}-%{release}
 
 Requires:	qt3-devel >= 3.3.8d
 Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
@@ -459,7 +466,7 @@ applications for TDE.
 
 ##########
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -467,6 +474,7 @@ applications for TDE.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
 
 
 %build
@@ -544,7 +552,7 @@ fi
 
 # Fix 'tderesources.desktop' (openSUSE only)
 %if 0%{?suse_version}
-%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
+%suse_update_desktop_file -r kresources Qt X-TDE-settings-desktop
 %endif
 
 # Remove setuid bit on some binaries.
@@ -571,16 +579,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit"
 
 
 %changelog
-* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
-- Remove integrated fileshareset.
-- Update dependencies.
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-- Fix XDG menu
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
index 7df2d7387..cd73a0285 100644
--- a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
+++ b/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
@@ -1,3 +1,4 @@
 setBadness('suse-dbus-unauthorized-service', 0)
 setBadness('permissions-file-setuid-bit', 0)
 setBadness('non-position-independent-executable', 0)
+setBadness('library-without-ldconfig-postun', 0)