From 05e7179a7ebf530d123ec3c567381c17225686d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 26 Jul 2013 20:17:29 +0200
Subject: RPM Packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'redhat')

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index a8428d058..e4dedd6d3 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -2043,11 +2043,17 @@ fi
 %if 0%{?with_selinux_policy}
 /usr/sbin/semodule -i "%{?_sysconfdir}/trinity/tdm/tdm.pp"
 %endif
-# Default user icon in TDM
+# Sets default user icon in TDM
 if [ ! -r "%{tde_datadir}/apps/tdm/faces/.default.face.icon" ]; then
   [ -d "%{tde_datadir}/apps/tdm/faces" ] || mkdir -p "%{tde_datadir}/apps/tdm/faces"
   %__cp -f "%{tde_datadir}/apps/tdm/pics/users/default2.png" "%{tde_datadir}/apps/tdm/faces/.default.face.icon"
 fi
+# Sets default language for TDM
+if [ "$1" = "1" ]; then
+  if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
+    %__sed -i "%{_sysconfdir}/trinity/tdm/tdmrc" -e "s|^#*Language=.*|Language=${LANG}|"
+  fi
+fi
 
 %posttrans -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-- 
cgit v1.2.1


From 7c8779619f078a4a3b565ffa1673bac2f8e70c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 28 Jul 2013 14:36:33 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'redhat')

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 3277300ae..87725f243 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -256,7 +256,14 @@ BuildRequires:	NetworkManager-glib-devel
 %endif
 
 # Certificates support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%define	cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
 Requires:		ca-certificates
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define	cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
+Requires:		openssl
+%endif
 
 # Trinity dependencies
 Requires:		trinity-tqt3 >= 3.5.0
@@ -514,8 +521,7 @@ echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc"
 
 # Use system-wide CA certificate
 %__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
-%__ln_s "%{_sysconfdir}/ssl/certs/ca-certificates.crt" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
-
+%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
 
 %clean
 %__rm -rf "%{?buildroot}"
-- 
cgit v1.2.1