X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=ca-certificates.spec;h=b72d72aa39e6127dfeb529441becc43e59ea0e7b;hb=f26e5a9a6e4d82ee5652aa013cc7c30e92a48c8c;hp=7534019e17d5f348440dca6bee41884e270915f0;hpb=f45c84174e7a640b2fcf1be5e4af178ca8402733;p=packages%2Fca-certificates.git

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 7534019..b72d72a 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -8,7 +8,7 @@ Summary:	Common CA Certificates PEM files
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 Version:	20090814
-Release:	8
+Release:	10
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -53,7 +53,7 @@ Source19:	http://www.sk.ee/files/JUUR-SK.PEM.cer
 # Source19-md5:	805784c06c9eff3771a4b9bd631cd3f5
 Source20:	http://www.sk.ee/files/ESTEID-SK.PEM.cer
 # Source20-md5:	387beee5b8539ab7d91628f486295899
-Source21:	http://www.sk.ee/files/ESTEID-SK%202007.PEM.cer
+Source21:	http://www.sk.ee/files/ESTEID-SK_2007.PEM.cer
 # Source21-md5:	2b1a2a77f565d68fdf5f19f6cc3a5600
 Patch0:		%{name}-undebianize.patch
 Patch1:		%{name}-more-certs.patch
@@ -63,18 +63,22 @@ Patch4:		%{name}-endline.patch
 Patch5:		%{name}-mozilla.patch
 Patch6:		%{name}-DESTDIR.patch
 URL:		http://www.cacert.org/
-BuildRequires:	openssl-tools >= 1.0.0
+BuildRequires:	openssl-tools
 BuildRequires:	python
 BuildRequires:	python-modules
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
-Conflicts:	openssl < 1.0.0
 Obsoletes:	certificates
 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.
@@ -88,7 +92,11 @@ Summary(pl.UTF-8):	Skrypt do odświeżania bazy certyfikatów CA
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	mktemp
-Requires:	openssl-tools >= 1.0.0
+%if "%{pld_release}" == "ac"
+Requires:	openssl-tools >= 0.9.7m-2
+%else
+Requires:	openssl-tools >= 0.9.8i-3
+%endif
 
 %description update
 Script and data for updating CA Certificates database.
@@ -106,6 +114,8 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 %patch5 -p1
 %patch6 -p1
 
+%{__sed} -i -e 's,@openssldir@,%{openssldir},' sbin/update-ca-certificates*
+
 %{__unzip} -qq %{SOURCE1} -d thawte
 # resolve file name clash
 mv 'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (EV)/thawte_Primary_Root_CA.pem' \