summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-28 14:36:33 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-28 14:36:33 +0200
commit7c8779619f078a4a3b565ffa1673bac2f8e70c19 (patch)
treeb3061b2081e59cf9a3aa9e6e3087b90fff52da5d
parentbe09efca6c856c44f5510c516cd3288600995704 (diff)
downloadtde-packaging-7c8779619f078a4a3b565ffa1673bac2f8e70c19.tar.gz
tde-packaging-7c8779619f078a4a3b565ffa1673bac2f8e70c19.zip
RPM Packaging: update tdelibs
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec10
1 files changed, 8 insertions, 2 deletions
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}"