Merge branch 'master' of ssh://pkgs.fedoraproject.org/ca-certificates
Conflicts: ca-certificates.spec
This commit is contained in:
commit
4a1396fc65
@ -35,7 +35,7 @@ Name: ca-certificates
|
||||
# because all future versions will start with 2013 or larger.)
|
||||
|
||||
Version: 2013.1.96
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: Public Domain
|
||||
|
||||
Group: System Environment/Base
|
||||
@ -258,6 +258,7 @@ fi
|
||||
%dir %{catrustdir}/extracted/pem
|
||||
%dir %{catrustdir}/extracted/openssl
|
||||
%dir %{catrustdir}/extracted/java
|
||||
%dir %{_datadir}/pki
|
||||
%dir %{_datadir}/pki/ca-trust-source
|
||||
%dir %{_datadir}/pki/ca-trust-source/anchors
|
||||
%dir %{_datadir}/pki/ca-trust-source/blacklist
|
||||
@ -293,9 +294,12 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 10 2014 Kai Engert <kaie@redhat.com> - 2013.1.96-2
|
||||
* Mon Feb 10 2014 Kai Engert <kaie@redhat.com> - 2013.1.96-3
|
||||
- Remove openjdk build dependency
|
||||
|
||||
* Sat Jan 25 2014 Ville Skyttä <ville.skytta@iki.fi> - 2013.1.96-2
|
||||
- Own the %%{_datadir}/pki dir.
|
||||
|
||||
* Thu Jan 09 2014 Kai Engert <kaie@redhat.com> - 2013.1.96-1
|
||||
- Update to CKBI 1.96 from NSS 3.15.4
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user