From 7c8779619f078a4a3b565ffa1673bac2f8e70c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 28 Jul 2013 14:36:33 +0200 Subject: [PATCH] RPM Packaging: update tdelibs --- redhat/tdelibs/tdelibs-14.0.0.spec | 10 ++++++++-- 1 file 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}"