RPM: massive update and cleanup

1 files changed, 9 insertions, 11 deletions

diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
index cf3edd2bb..9f1a67da7 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
@@ -18,7 +18,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 tdenetworkmanager
 %define tde_prefix /opt/trinity
@@ -84,7 +84,7 @@ Provides:		trinity-knetworkmanager = %{version}-%{release}
 %if 0%{?rhel} || 0%{?fedora}
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
 Requires:		NetworkManager
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 BuildRequires:	NetworkManager-libnm-devel
 %else
 BuildRequires:		NetworkManager-devel
@@ -98,7 +98,7 @@ Requires:		networkmanager
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
 %if 0%{?pclinuxos} == 0
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 BuildRequires:	NetworkManager-libnm-devel
 %else
 BuildRequires:	NetworkManager-glib-devel
@@ -151,7 +151,7 @@ if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
   fi
 fi
 
-%files -f %{tde_pkg}.lang
+%files
 %defattr(-,root,root,-)
 %{tde_bindir}/tdenetworkmanager
 %{tde_libdir}/*.la
@@ -163,11 +163,11 @@ fi
 %{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop
 %{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop
 %{tde_datadir}/autostart/tdenetworkmanager.desktop
-%{tde_datadir}/services/tdenetman_openvpn.desktop
-%{tde_datadir}/services/tdenetman_pptp.desktop
-%{tde_datadir}/services/tdenetman_strongswan.desktop
-%{tde_datadir}/services/tdenetman_vpnc.desktop
-%{tde_tdedocdir}/HTML/en/tdenetworkmanager/
+#{tde_datadir}/services/tdenetman_openvpn.desktop
+#{tde_datadir}/services/tdenetman_pptp.desktop
+#{tde_datadir}/services/tdenetman_strongswan.desktop
+#{tde_datadir}/services/tdenetman_vpnc.desktop
+#{tde_tdedocdir}/HTML/en/tdenetworkmanager/
 
 ##########
 
@@ -231,8 +231,6 @@ fi
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=%{?buildroot} -C build
 
-%find_lang %{tde_pkg}
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet