diff options
| author | François Andriot <[email protected]> | 2013-07-28 14:39:39 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2013-07-28 14:39:39 +0200 |
| commit | 15546e1bdcca076459d4dde156a47334f8a64955 (patch) | |
| tree | bb46f0310f551c5609d4e8add6882a6b7ba89d1b /redhat | |
| parent | 87d7ecf03757f5b4001a7c8682ce46c9eb1b6037 (diff) | |
| parent | 7c8779619f078a4a3b565ffa1673bac2f8e70c19 (diff) | |
| download | tde-packaging-15546e1bdcca076459d4dde156a47334f8a64955.tar.gz tde-packaging-15546e1bdcca076459d4dde156a47334f8a64955.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0.spec | 8 | ||||
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 55c5d389c..31d1c786f 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/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' diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index f65aef3d8..776aa744b 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/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}" |