X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=blobdiff_plain;f=ca-certificates.spec;h=5c3cc623acaae5c49e1be6da09a1df0a85da3672;hp=814654e8b32ea69a8a58320103e4a1614d5512ef;hb=277121c23fe1803efb1da5f0be55a27514dd2703;hpb=93ad0ea19f02a2aaf5f5703ab3d01c3587522524

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 814654e..5c3cc62 100644
--- 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:	20120212
-Release:	2
-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
@@ -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