1 files changed, 11 insertions, 12 deletions
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