RPM: massive update and cleanup

4 files changed, 11 insertions, 637 deletions

diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.patch b/redhat/main/tdelibs/tdelibs-14.0.1.patch
deleted file mode 100644
index ab309f841..000000000
--- a/redhat/main/tdelibs/tdelibs-14.0.1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index c4812b447..000000000
--- a/redhat/main/tdelibs/tdelibs-14.1.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 7775f4908..000000000
--- a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
+++ /dev/null
@@ -1,581 +0,0 @@
-#
-# spec file for package tdelibs (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# 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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdelibs
-%define tde_prefix /opt/trinity
-%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_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
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		TDE Libraries
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:			Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-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}
-Provides:		trinity-kdelibs = %{version}-%{release}
-Obsoletes:		trinity-kdelibs-apidocs < %{version}-%{release}
-Provides:		trinity-kdelibs-apidocs = %{version}-%{release}
-
-# for set_permissions macro
-%if 0%{?suse_version}
-PreReq: permissions
-%endif
-
-# Trinity dependencies
-BuildRequires:	libtqt4-devel = %{tde_epoch}:4.2.0
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
-BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
-BuildRequires:	trinity-filesystem >= %{tde_version}
-
-Requires:		trinity-arts >= %{tde_epoch}:1.5.10
-Requires:		trinity-filesystem >= %{tde_version}
-Requires:		fileshareset >= 2.0
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-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
-
-# XSLT support
-BuildRequires:	libxslt-devel
-
-# ALSA support
-BuildRequires:	alsa-lib-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# CUPS support
-BuildRequires:	cups-devel
-
-# TIFF support
-BuildRequires:	libtiff-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# LUA support are not ready yet
-#BuildRequires:	lua-devel
-
-# LIBART_LGPL support
-BuildRequires:	libart_lgpl-devel
-
-# ASPELL support
-BuildRequires:	aspell
-BuildRequires:	aspell-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_pcre 1
-BuildRequires:	pcre-devel
-%endif
-
-# INOTIFY support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_inotify 1
-%endif
-
-# BZIP2 support
-%if 0%{?suse_version}
-BuildRequires:	libbz2-devel
-%else
-BuildRequires:	bzip2-devel
-%endif
-
-# UTEMPTER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libutempter-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	utempter
-%endif
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-
-# HSPELL support
-%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_hspell 1
-BuildRequires:	hspell-devel
-%endif
-
-# JASPER support
-%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%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	jasper-devel
-%endif
-%endif
-
-# AVAHI support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_avahi 1
-BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# OPENEXR support
-%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_openexr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# LIBTOOL
-BuildRequires:	libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libltdl-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-# X11 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-proto-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xorg-x11-proto-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-# ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-Requires:		iceauth
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:		xorg-x11-server-utils
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:		xorg-x11
-%endif
-
-# XZ support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-%define with_lzma 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	liblzma-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xz-devel
-%endif
-%endif
-
-# Certificates support
-%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} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
-%define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
-Requires:		openssl
-%endif
-%if 0%{?rhel} == 5
-%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
-Requires:		openssl
-%endif
-%if 0%{?suse_version}
-%define cacert	%{_sysconfdir}/ssl/ca-bundle.pem
-BuildRequires:	ca-certificates
-Requires:		ca-certificates
-%endif
-%if "%{cacert}" != ""
-Requires:		%{cacert}
-%endif
-
-# XRANDR support
-#  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_xrandr 1
-%endif
-
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-%define xcomposite_devel libxcomposite-devel
-%else
-%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-%define xcomposite_devel libXcomposite-devel
-%endif
-%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
-
-# XT support
-%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),
-kfm (file manager), tdehtmlw (HTML widget), tdeio (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}/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}/kdetcompmgr
-%{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
-%{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_wrapper
-%{tde_bindir}/checkXML
-%{tde_bindir}/ksvgtopng
-%{tde_bindir}/kunittestmodrunner
-%{tde_bindir}/preparetips
-%{tde_tdelibdir}/*
-%{tde_libdir}/lib*.so.*
-%{tde_libdir}/libkdeinit_*.la
-%{tde_libdir}/libkdeinit_*.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/crystalsvg/
-%{tde_datadir}/icons/default.kde
-%{tde_datadir}/icons/hicolor/index.theme
-%{tde_datadir}/locale/all_languages
-%{tde_datadir}/mimelnk/magic
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/services/*
-%{tde_datadir}/servicetypes/*
-%{tde_tdedocdir}/HTML/en/common/*
-%{tde_tdedocdir}/HTML/en/kspell/
-
-# Some setuid binaries need special care
-%if 0%{?suse_version}
-%verify(not mode) %{tde_bindir}/kgrantpty
-%verify(not mode) %{tde_bindir}/kpac_dhcp_helper
-%verify(not mode) %{tde_bindir}/start_kdeinit
-%else
-%attr(4755,root,root) %{tde_bindir}/kgrantpty
-%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
-%attr(4711,root,root) %{tde_bindir}/start_kdeinit
-%endif
-
-%config %{_sysconfdir}/xdg/menus/tde-applications.menu
-
-%pre
-# TDE Bug #1074
-if [ -d "%{tde_datadir}/locale/all_languages" ]; then
-  rm -rf "%{tde_datadir}/locale/all_languages"
-fi
-
-%post
-/sbin/ldconfig || :
-
-%if 0%{?suse_version}
-# Sets permissions on setuid files (openSUSE specific)
-%set_permissions %{tde_bindir}/kgrantpty
-%set_permissions %{tde_bindir}/kpac_dhcp_helper
-%set_permissions %{tde_bindir}/start_kdeinit
-%endif
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	TDE Libraries (Development files)
-Group:		Development/Libraries/X11
-Requires:	%{name} = %{tde_epoch}:%{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
-Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-Requires:	libart_lgpl-devel
-%{?xcomposite_devel:Requires: %{xcomposite_devel}}
-%{?xt_devel:Requires: %{xt_devel}}
-
-%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
-%{tde_datadir}/cmake/kdelibs.cmake
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%{?tde_patch:%patch1 -p1}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="${QTDIR}/bin:${PATH}"
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
-fi
-
-export KDEDIR="%{tde_prefix}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_ALSA=ON \
-  -DWITH_LIBART=ON \
-  -DWITH_LIBIDN=ON \
-  -DWITH_SSL=ON \
-  -DWITH_CUPS=ON \
-  -DWITH_LUA=OFF \
-  -DWITH_TIFF=ON \
-  %{?with_jasper:-DWITH_JASPER=ON} \
-  %{?with_openexr:-DWITH_OPENEXR=ON} \
-  -DWITH_UTEMPTER=ON \
-  %{?with_avahi:-DWITH_AVAHI=ON} \
-  %{?!with_pcre:-DWITH_PCRE=OFF} \
-  %{?!with_inotify:-DWITH_INOTIFY=OFF} \
-  %{?!with_gamin:-DWITH_GAMIN=OFF} \
-  -DWITH_SUDO_KDESU_BACKEND=OFF \
-  %{?!with_lzma:-DWITH_LZMA=OFF} \
-  -DWITH_ASPELL=ON \
-  %{?!with_hspell:-DWITH_HSPELL=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf "%{?buildroot}"
-%__make install DESTDIR="%{?buildroot}" -C build
-
-# Use system-wide CA certificates
-%if "%{?cacert}" != ""
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
-%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
-%endif
-
-# Symlinks duplicate files (mostly under 'ksgmltools2')
-%fdupes -s "%{?buildroot}"
-
-# Fix 'tderesources.desktop' (openSUSE only)
-%if 0%{?suse_version}
-%suse_update_desktop_file -r kresources Qt X-TDE-settings-desktop
-%endif
-
-# Remove setuid bit on some binaries.
-chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
-chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
-chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit"
-
-# fileshareset 2.0 is provided separately.
-# Remove integrated fileshareset 1.0 .
-%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
-%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
-
-
-%clean
-%__rm -rf "%{?buildroot}"
-
-%if 0%{?suse_version}
-# Check permissions on setuid files (openSUSE specific)
-%verifyscript
-%verify_permissions -e %{tde_bindir}/kgrantpty
-%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
-%verify_permissions -e %{tde_bindir}/start_kdeinit
-%endif
-
-
-%changelog
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
index 0afe618fe..fccb79b77 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/main/tdelibs/tdelibs.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg tdelibs
 %define tde_prefix /opt/trinity
@@ -60,9 +60,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		%{name}-rpmlintrc
 
-Patch0:			tdelibs-14.0.1.patch
-Patch1:			tdelibs-14.1.0.patch
-
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs < %{version}-%{release}
@@ -246,12 +243,15 @@ BuildRequires:	xorg-x11-devel
 # ICEAUTH
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
 Requires:		iceauth
+BuildRequires:	iceauth
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
 Requires:		xorg-x11-server-utils
+BuildRequires:	xorg-x11-server-utils
 %endif
 %if 0%{?rhel} == 4 || 0%{?suse_version}
 Requires:		xorg-x11
+BuildRequires:	xorg-x11
 %endif
 
 # XZ support
@@ -338,7 +338,7 @@ BuildRequires:	file-devel
 BuildRequires:	%{_lib}nm-util-devel
 %endif
 %if 0%{?rhel} >= 6 || 0%{?fedora}
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 BuildRequires:	NetworkManager-libnm-devel
 %else
 BuildRequires:	NetworkManager-glib-devel
@@ -361,7 +361,7 @@ BuildRequires:	libudev-devel
 %endif
 
 # UDISKS support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
+%if 0%{?rhel} == 6
 %if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310
 %define with_udisks 1
 BuildRequires:	udisks-devel
@@ -369,9 +369,6 @@ Requires:		udisks
 %endif
 %endif
 
-# PMOUNT support
-#Requires:		pmount
-
 # UDISKS2 support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
 %define with_udisks2 1
@@ -444,6 +441,9 @@ BuildRequires:		libr-devel >= 0.6.0
 # ATTR support
 BuildRequires:	libattr-devel
 
+# INTLTOOL support
+BuildRequires:	intltool
+
 
 %description
 Libraries for the Trinity Desktop Environment:
@@ -536,7 +536,7 @@ kimgio (image manipulation).
 %{tde_tdedocdir}/HTML/en/tdespell/
 
 # Global Trinity configuration
-%config %{tde_confdir}
+%config(noreplace) %{tde_confdir}
 
 # Some setuid binaries need special care
 %if 0%{?suse_version}
@@ -590,6 +590,7 @@ Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
 Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 Requires:	libart_lgpl-devel
 Requires:	libattr-devel
+Requires:	intltool
 %{?xcomposite_devel:Requires: %{xcomposite_devel}}
 %{?xt_devel:Requires: %{xt_devel}}
 
@@ -622,8 +623,6 @@ 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