RPM: Update for final R14.1.1.

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

10 files changed, 21 insertions, 10 deletions

diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec
index 827385dc7..7f64349e9 100644
--- a/redhat/applications/settings/kima/kima.spec
+++ b/redhat/applications/settings/kima/kima.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 kima
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec
index 5aae73aa9..0f3aefcf4 100644
--- a/redhat/applications/settings/kiosktool/kiosktool.spec
+++ b/redhat/applications/settings/kiosktool/kiosktool.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 kiosktool
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec
index 4381ff697..10b0b120f 100644
--- a/redhat/applications/settings/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/settings/kkbswitch/kkbswitch.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 kkbswitch
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec
index 918f57f48..5ce0fcb9a 100644
--- a/redhat/applications/settings/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/settings/klcddimmer/klcddimmer.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 klcddimmer
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
index 7998140e5..dddb03c7e 100644
--- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.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 kmyfirewall
 %define tde_prefix /opt/trinity
@@ -146,6 +146,7 @@ university etc.)
 %{tde_datadir}/mimelnk/application/kmfrs.desktop
 %{tde_datadir}/services/kmf*.desktop
 %{tde_datadir}/servicetypes/kmf*.desktop
+%{tde_mandir}/man1/kmyfirewall.1*
 
 ##########
 
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index c743098c2..c9962b718 100644
--- a/redhat/applications/settings/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.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-guidance
 %define tde_prefix /opt/trinity
@@ -377,6 +377,11 @@ if [ -d /usr/X11R6 ]; then
   %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
 fi
 
+# FIXME: ordinal not in range in rhel7
+%if 0%{?rhel} == 7
+export LC_ALL=en_US.UTF-8
+%endif
+
 %__python ./setup.py build
 
 
@@ -393,6 +398,11 @@ export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
 # For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
 export PYTHONDONTWRITEBYTECODE=
 
+# FIXME: ordinal not in range in rhel7
+%if 0%{?rhel} == 7
+export LC_ALL=en_US.UTF-8
+%endif
+
 %__rm -rf %{buildroot}
 %__python ./setup.py install \
 	--prefix=%{tde_prefix} \
diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
index 18b2af3d8..0ce6eeb4d 100644
--- a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.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-systemsettings
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
index 46d1c6d1a..0d2b74f23 100644
--- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.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 tdenetworkmanager
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec
index 78395d8da..05fd543ec 100644
--- a/redhat/applications/settings/tdesudo/tdesudo.spec
+++ b/redhat/applications/settings/tdesudo/tdesudo.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 tdesudo
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index 00322f76c..d61373abf 100644
--- a/redhat/applications/settings/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.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 wlassistant
 %define tde_prefix /opt/trinity