Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

redhat/tdebase/tdebase-14.0.0.spec

@@ -2044,11 +2044,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'

redhat/tdelibs/tdelibs-14.0.0.spec

@@ -257,7 +257,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
@@ -523,8 +530,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}"