diff --git a/ca-certificates-mozilla.changes b/ca-certificates-mozilla.changes index dfd322b..784898e 100644 --- a/ca-certificates-mozilla.changes +++ b/ca-certificates-mozilla.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jun 21 12:59:53 UTC 2013 - lnussel@suse.de + +- use correct 'anchors' subdirectory + +------------------------------------------------------------------- +Wed Jun 19 09:30:00 UTC 2013 - lnussel@suse.de + +- new location of CA certificate anchors is + /usr/share/ca-certificates/anchors + ------------------------------------------------------------------- Thu Jan 3 19:16:01 UTC 2013 - idonmez@suse.com diff --git a/ca-certificates-mozilla.spec b/ca-certificates-mozilla.spec index 5c604cb..e132ef4 100644 --- a/ca-certificates-mozilla.spec +++ b/ca-certificates-mozilla.spec @@ -16,12 +16,19 @@ # +%if 0%{?suse_version} < 1310 %bcond_with trustedcerts +%define certdir %{_datadir}/ca-certificates/mozilla +%else +%bcond_without trustedcerts +%define certdir %{trustdir_static}/anchors +BuildRequires: p11-kit-devel +%endif +BuildRequires: ca-certificates BuildRequires: openssl Name: ca-certificates-mozilla -%define sslusrdir %{_datadir}/ca-certificates Version: 1.85 Release: 0 Summary: CA certificates for OpenSSL @@ -68,7 +75,7 @@ install -m 644 %{S:1} COPYING perl %{SOURCE1} --trustbits < certdata.txt %install -mkdir -p %{buildroot}/%{sslusrdir}/mozilla +mkdir -p %{buildroot}/%{certdir} set +x for i in *.pem; do args=() @@ -90,7 +97,7 @@ for i in *.pem; do { grep '^#' "$i" openssl x509 -in "$i" "${args[@]}" - } > "%{buildroot}/%{sslusrdir}/mozilla/$i" + } > "%{buildroot}/%{certdir}/$i" done set -x @@ -103,6 +110,6 @@ update-ca-certificates || true %files %defattr(-, root, root) %doc COPYING -%{sslusrdir}/mozilla +%{certdir} %changelog