- up to 20121105

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

diff --git a/ca-certificates.spec b/ca-certificates.spec
index d54df79dc111ac972d34047bfdd56a6df05d958b..b1a744329bf1de307df60137c5b9d1cb8b96edca 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -7,12 +7,12 @@
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-Version:       20120623
+Version:       20121105
 Release:       1
 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: 5105d4cc086f0d4ecf7bf2e4c4667289
+# Source0-md5: 9f5eed928cab9b71242d77dda9bed25b
 Source1:       https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5: a3709cc0279ef3fca4f86ea775066b18
 Source2:       http://www.certum.pl/keys/CA.pem
@@ -76,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.
@@ -95,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
@@ -149,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
@@ -168,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