diff --git a/ca-certificates.spec b/ca-certificates.spec index e7aa252..59dc400 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -1,6 +1,6 @@ Name: ca-certificates Version: 20150426 -Release: 1mamba +Release: 2mamba Summary: The Mozilla CA root certificate bundle Group: System/Tools Vendor: openmamba @@ -21,6 +21,9 @@ BuildRequires: rcs #BuildRequires: java-openjdk #%endif Requires(post): openssl +Provides: ca-certificates-java +Obsoletes: ca-certificates-java +Requires(post): p11-kit BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -39,7 +42,7 @@ mkdir %{name} %{name}/certs %{name}/java install -d -m755 %{buildroot}/{%{_sysconfdir}/ca-certificates/update.d,%{_sbindir},%{_datadir}/ca-certificates,%{_sysconfdir}/ssl/certs} %makeinstall install -D -m644 sbin/update-ca-certificates.8 %{buildroot}%{_mandir}/man8/update-ca-certificates.8 - +install -d -m755 %{buildroot}%{_sysconfdir}/ssl/certs/java ( echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" echo "# see update-ca-certificates man page" @@ -52,8 +55,13 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/pki/tls/certs ln -s ../../../ssl/certs/ca-certificates.crt %{buildroot}%{_sysconfdir}/pki/tls/certs/ca-bundle.crt ln -s certs/ca-bundle.crt %{buildroot}%{_sysconfdir}/pki/tls/cert.pem +install -d -m0755 %{buildroot}%{_sysconfdir}/pki/java/ +ln -s ../../ssl/certs/java/cacerts %{buildroot}%{_sysconfdir}/pki/java/cacerts + %posttrans if [ $1 -ge 1 ]; then +trust extract --overwrite --format=java-cacerts --filter=ca-anchors \ + --purpose server-auth %{_sysconfdir}/ssl/certs/java/cacerts %{_sbindir}/update-ca-certificates --fresh >/dev/null 2>&1 fi : @@ -70,8 +78,11 @@ fi %{_sysconfdir}/pki/tls/cert.pem %dir %{_sysconfdir}/pki/tls/certs %{_sysconfdir}/pki/tls/certs/ca-bundle.crt +%dir %{_sysconfdir}/pki/java +%{_sysconfdir}/pki/java/cacerts %dir %{_sysconfdir}/ssl %{_sysconfdir}/ssl/certs +%dir %{_sysconfdir}/ssl/certs/java %{_sbindir}/update-ca-certificates %dir %{_datadir}/ca-certificates #%dir %{_datadir}/ca-certificates/cacert.org @@ -84,6 +95,9 @@ fi %{_mandir}/man8/update-ca-certificates.8* %changelog +* Wed Jan 20 2016 Silvan Calarco 20150426-2mamba +- use trust extract in post script to generate java cacerts bundle; obsolete ca-certificates-java + * Mon Jun 08 2015 Automatic Build System 20150426-1mamba - automatic update by autodist