From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Thu, 6 May 2010 06:40:38 +0000 (+0000)
Subject: - rel 8; force new openssl since mixing ca-certificates with hashes from old openssl... 
X-Git-Tag: auto/ac/ca-certificates-20090814-10~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=commitdiff_plain;h=f45c84174e7a640b2fcf1be5e4af178ca8402733

- rel 8; force new openssl since mixing ca-certificates with hashes from old openssl with new openssl library (and vice versa) is asking for trouble

Changed files:
    ca-certificates.spec -> 1.34
---

diff --git a/ca-certificates.spec b/ca-certificates.spec
index d8ed3a6..7534019 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:	7
+Release:	8
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -63,11 +63,12 @@ Patch4:		%{name}-endline.patch
 Patch5:		%{name}-mozilla.patch
 Patch6:		%{name}-DESTDIR.patch
 URL:		http://www.cacert.org/
-BuildRequires:	openssl-tools
+BuildRequires:	openssl-tools >= 1.0.0
 BuildRequires:	python
 BuildRequires:	python-modules
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
+Conflicts:	openssl < 1.0.0
 Obsoletes:	certificates
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -87,7 +88,7 @@ Summary(pl.UTF-8):	Skrypt do odświeżania bazy certyfikatów CA
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	mktemp
-Requires:	openssl-tools >= 0.9.8i-3
+Requires:	openssl-tools >= 1.0.0
 
 %description update
 Script and data for updating CA Certificates database.