RPM: Update for final R14.1.1.

Signed-off-by: François Andriot <[email protected]>

19 files changed, 25 insertions, 39 deletions

diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec
index 3884089c7..491111ee3 100644
--- a/redhat/core/tde-i18n/tde-i18n.spec
+++ b/redhat/core/tde-i18n/tde-i18n.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 tde-i18n
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec
index 7034a5984..b821069ad 100644
--- a/redhat/core/tdeaccessibility/tdeaccessibility.spec
+++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec
@@ -22,7 +22,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 tdeaccessibility
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec
index 5b57a05de..7e8e7bee9 100644
--- a/redhat/core/tdeaddons/tdeaddons.spec
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg tdeaddons
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec
index 441e3d866..6436b2309 100644
--- a/redhat/core/tdeadmin/tdeadmin.spec
+++ b/redhat/core/tdeadmin/tdeadmin.spec
@@ -22,7 +22,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 tdeadmin
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec
index ad15a0c1d..24d94f6f2 100644
--- a/redhat/core/tdeartwork/tdeartwork.spec
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -22,7 +22,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 tdeartwork
 %define tde_prefix /opt/trinity
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 \
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index 87f59ea32..ab5f9fa6d 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -27,7 +27,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 tdebindings
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec
index 7bbef35e9..f4370dfe5 100644
--- a/redhat/core/tdeedu/tdeedu.spec
+++ b/redhat/core/tdeedu/tdeedu.spec
@@ -22,7 +22,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 tdeedu
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec
index 273705e9f..3f463d0bd 100644
--- a/redhat/core/tdegames/tdegames.spec
+++ b/redhat/core/tdegames/tdegames.spec
@@ -22,7 +22,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 tdegames
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec
index 1be2d079d..6df51cc83 100644
--- a/redhat/core/tdegraphics/tdegraphics.spec
+++ b/redhat/core/tdegraphics/tdegraphics.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 tdegraphics
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec
index 6b817e97b..9e03ce0db 100644
--- a/redhat/core/tdelibs/tdelibs.spec
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -22,7 +22,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 tdelibs
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index 13b679bbd..432e2d0bd 100644
--- a/redhat/core/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -22,7 +22,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 tdemultimedia
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec
index 2dd26ce3e..0e4463018 100644
--- a/redhat/core/tdenetwork/tdenetwork.spec
+++ b/redhat/core/tdenetwork/tdenetwork.spec
@@ -26,7 +26,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 tdenetwork
 %define tde_prefix /opt/trinity
@@ -715,7 +715,7 @@ Support for more IM protocols can be added through a plugin system.
 %endif
 # smpp plugin for kopete
 %{tde_datadir}/config.kcfg/smpppdcs.kcfg
-# aim support is deprecated in TDE 14.1.0
+# aim support is deprecated in TDE 14.1.x
 %if 0%{?with_aim}
 %{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
 %{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec
index e3a9f483e..d6b4cc1e5 100644
--- a/redhat/core/tdepim/tdepim.spec
+++ b/redhat/core/tdepim/tdepim.spec
@@ -22,7 +22,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 tdepim
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec
index 53dfffc6e..dd08e7075 100644
--- a/redhat/core/tdesdk/tdesdk.spec
+++ b/redhat/core/tdesdk/tdesdk.spec
@@ -22,7 +22,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 tdesdk
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec
index eb823346d..cd516dd71 100644
--- a/redhat/core/tdetoys/tdetoys.spec
+++ b/redhat/core/tdetoys/tdetoys.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg tdetoys
 %define tde_prefix /opt/trinity
diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec
index eb42326d0..17749989e 100644
--- a/redhat/core/tdeutils/tdeutils.spec
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg tdeutils
 %define tde_prefix /opt/trinity
@@ -169,9 +169,7 @@ BuildRequires:	openssl-devel
 %define dont_relink 1
 %endif
 
-%if "%{?tde_version}" == "14.1.0"
 %define build_tdefilereplace 1
-%endif
 
 Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release}
diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec
index 5730a8207..9a9ad31f7 100644
--- a/redhat/core/tdevelop/tdevelop.spec
+++ b/redhat/core/tdevelop/tdevelop.spec
@@ -22,7 +22,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 tdevelop
 %define tde_prefix /opt/trinity
@@ -317,8 +317,6 @@ individual needs.
 %{tde_tdelibdir}/libkdevphpsupport.so
 %{tde_tdelibdir}/libkdevpythonsupport.la
 %{tde_tdelibdir}/libkdevpythonsupport.so
-%{tde_tdelibdir}/libkdevqt4importer.la
-%{tde_tdelibdir}/libkdevqt4importer.so
 %{tde_tdelibdir}/libkdevqtimporter.la
 %{tde_tdelibdir}/libkdevqtimporter.so
 %{tde_tdelibdir}/libkdevquickopen.la
@@ -437,7 +435,6 @@ individual needs.
 %{tde_datadir}/services/kdevpghpfoptions.desktop
 %{tde_datadir}/services/kdevphpsupport.desktop
 %{tde_datadir}/services/kdevpythonsupport.desktop
-%{tde_datadir}/services/kdevqt4importer.desktop
 %{tde_datadir}/services/kdevqtimporter.desktop
 %{tde_datadir}/services/kdevquickopen.desktop
 %{tde_datadir}/services/kdevrbdebugger.desktop
diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec
index 58bc4c371..68f95aa31 100644
--- a/redhat/core/tdewebdev/tdewebdev.spec
+++ b/redhat/core/tdewebdev/tdewebdev.spec
@@ -22,7 +22,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 tdewebdev
 %define tde_prefix /opt/trinity
@@ -104,9 +104,7 @@ BuildRequires:	libicu-devel
 # Readline support
 BuildRequires:	readline-devel
 
-%if "%{?tde_version}" != "14.1.0"
-%define build_tdefilereplace 1
-%endif
+%define build_tdefilereplace 0
 
 Obsoletes:	trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release}