RPM: Update for final R14.1.1.

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 5 insertions, 12 deletions

diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 390e4a1af..fa3501b5a 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg tdebase
 %define tde_prefix /opt/trinity
@@ -1145,11 +1145,9 @@ plugdev group.
 %{tde_tdedocdir}/HTML/en/tdefontview/
 
 # tdehwtray
-%if "%{?tde_version}" == "14.1.0"
 %{tde_bindir}/tdehwdevicetray
 %{tde_tdeappdir}/tdehwdevicetray.desktop
 %{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
-%endif
 
 # The following features are not compiled under RHEL 5 and older
 %if 0%{?with_tderandrtray}
@@ -1835,11 +1833,9 @@ group.
 %{tde_tdelibdir}/media_propsdlgplugin.so
 %{tde_datadir}/services/media_propsdlgplugin.desktop
 
-%if "%{tde_version}" == "14.1.0"
 %{tde_tdelibdir}/ktrashpropsdlgplugin.la
 %{tde_tdelibdir}/ktrashpropsdlgplugin.so
 %{tde_datadir}/services/ktrashpropsdlgplugin.desktop
-%endif
 
 ##########
 
@@ -2096,10 +2092,7 @@ already. Most users won't need this.
 %{tde_mandir}/man1/tdmctl.1*
 %{tde_mandir}/man1/tdm_config.1*
 %{tde_mandir}/man1/tdm_greet.1*
-
-%if "%{?tde_version}" == "14.1.0"
 %{tde_bindir}/tdecryptocardwatcher
-%endif
 
 # XDG user faces
 %dir %{_datadir}/faces
@@ -2826,10 +2819,6 @@ TDE will start, but many good defaults will not be set.
 %{tde_mandir}/man1/starttde.1*
 
 %post -n trinity-ksmserver
-%if 0%{?mdkversion} || 0%{?mgaversion}
-fndSession
-%endif
-
 # openSUSE 15.0 alternatives
 %if 0%{?suse_version} >= 1500
 update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || :
@@ -3007,6 +2996,7 @@ This package contains the default X window manager for TDE.
 %{tde_tdeappdir}/twinoptions.desktop
 %{tde_tdeappdir}/twinrules.desktop
 %{tde_datadir}/applnk/.hidden/twinactions.desktop
+%{tde_datadir}/applnk/.hidden/twinactiveborders.desktop
 %{tde_datadir}/applnk/.hidden/twinadvanced.desktop
 %{tde_datadir}/applnk/.hidden/twinfocus.desktop
 %{tde_datadir}/applnk/.hidden/twinmoving.desktop
@@ -3200,6 +3190,9 @@ Windows and Samba shares.
 if [ -x "/usr/bin/reboot" ]; then
   POWEROFF="/usr/bin/poweroff"
   REBOOT="/usr/bin/reboot"
+elif [ -x "/usr/sbin/reboot" ]; then
+  POWEROFF="/usr/sbin/poweroff"
+  REBOOT="/usr/sbin/reboot"
 fi
 if [ -n "${REBOOT}" ]; then
   %__sed -i \