- %prep that depends BR moved to build

[packages/ca-certificates.git] / ca-certificates.spec

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 4e586498f1dce7c379e36a44d1876b599b67cd38..5c3cc623acaae5c49e1be6da09a1df0a85da3672 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,9 +1,5 @@
 # TODO
 # - cleanup dead links from /etc/openssl/certs after -update uninstall
-# - deal with removed (renamed) certs on upgrade (as new config is created as
-#   .rpmnew). create some merge tool (or split /etc/ca-certificates.conf to
-#   /etc/ca-certificates.d): http://pastebin.com/04hZd2x0
-#
 # - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
 #   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#
 # - add certs noted in TODO file
@@ -11,12 +7,12 @@
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-Version:       20120212
-Release:       1
-License:       distributable
+Version:       20120623
+Release:       4
+License:       GPL v2 (scripts), MPL v2 (mozilla certs), distributable (other certs)
 Group:         Libraries
 Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
-# Source0-md5: 391dea8d827db935ca0d0d1e6641bf23
+# Source0-md5: 5105d4cc086f0d4ecf7bf2e4c4667289
 Source1:       https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5: a3709cc0279ef3fca4f86ea775066b18
 Source2:       http://www.certum.pl/keys/CA.pem
@@ -66,8 +62,8 @@ Patch1:               %{name}-more-certs.patch
 Patch2:                %{name}-etc-certs.patch
 Patch3:                %{name}-c_rehash.sh.patch
 Patch4:                %{name}-endline.patch
-Patch5:                %{name}-mozilla.patch
-Patch6:                %{name}-DESTDIR.patch
+Patch5:                %{name}-DESTDIR.patch
+Patch6:                %{name}.d.patch
 URL:           http://www.cacert.org/
 BuildRequires: openssl-tools
 BuildRequires: python
@@ -80,11 +76,7 @@ BuildArch:   noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                certsdir        /etc/certs
-%if "%{pld_release}" == "th"
 %define                openssldir      /etc/openssl/certs
-%else
-%define                openssldir      /var/lib/openssl/certs
-%endif
 
 %description
 Common CA Certificates PEM files.
@@ -99,7 +91,7 @@ Group:                Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      mktemp
 %if "%{pld_release}" == "ac"
-Requires:      openssl-tools >= 0.9.7m-2
+Requires:      openssl-tools >= 0.9.7m-6.3
 %else
 Requires:      openssl-tools >= 0.9.8i-3
 %endif
@@ -153,13 +145,6 @@ for a in certum/*.pem; do
        mv -i "$a" "${a%.pem}.crt"
 done
 
-install -d terena
-openssl x509 -inform DER -in %{SOURCE14} -outform PEM -out terena/$(basename %{SOURCE14})
-openssl x509 -inform DER -in %{SOURCE15} -outform PEM -out terena/$(basename %{SOURCE15})
-openssl x509 -inform DER -in %{SOURCE16} -outform PEM -out terena/$(basename %{SOURCE16})
-openssl x509 -inform DER -in %{SOURCE17} -outform PEM -out terena/$(basename %{SOURCE17})
-openssl x509 -inform DER -in %{SOURCE18} -outform PEM -out terena/$(basename %{SOURCE18})
-
 # http://www.sk.ee/en/Repository/certs/rootcertificates
 # JUUR-SK, ESTEID-SK and ESTEID-SK 2007, ESTEID-SK 2011
 install -d esteid
@@ -172,6 +157,13 @@ for a in esteid/*.PEM.cer; do
 done
 
 %build
+install -d terena
+openssl x509 -inform DER -in %{SOURCE14} -outform PEM -out terena/$(basename %{SOURCE14})
+openssl x509 -inform DER -in %{SOURCE15} -outform PEM -out terena/$(basename %{SOURCE15})
+openssl x509 -inform DER -in %{SOURCE16} -outform PEM -out terena/$(basename %{SOURCE16})
+openssl x509 -inform DER -in %{SOURCE17} -outform PEM -out terena/$(basename %{SOURCE17})
+openssl x509 -inform DER -in %{SOURCE18} -outform PEM -out terena/$(basename %{SOURCE18})
+
 %{__make}
 
 # We have those and more in specific dirs
@@ -182,8 +174,7 @@ rm mozilla/{Thawte,thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2,Juur-SK}*.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir}}
-
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir},%{_sysconfdir}/ca-certificates.d}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -214,4 +205,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/update-ca-certificates
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ca-certificates.conf
+%dir %{_sysconfdir}/ca-certificates.d
 %{_datadir}/ca-certificates