use same paths on AC as on HEAD

diff --git a/ca-certificates.spec b/ca-certificates.spec
index d54df79dc111ac972d34047bfdd56a6df05d958b..8a466dadb2c139b03c88eeb90b15404e1d2495dd 100644 (file)
--- 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:       20120623
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
 Version:       20120623

-Release:       1
+Release:       2

 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
 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


@@ -76,11 +76,7 @@ BuildArch:   noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                certsdir        /etc/certs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                certsdir        /etc/certs

-%if "%{pld_release}" == "th"

 %define                openssldir      /etc/openssl/certs
 %define                openssldir      /etc/openssl/certs

-%else
-%define                openssldir      /var/lib/openssl/certs
-%endif

 
 %description
 Common CA Certificates PEM files.
 
 %description
 Common CA Certificates PEM files.


@@ -95,7 +91,7 @@ Group:                Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      mktemp
 %if "%{pld_release}" == "ac"
 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
 %else
 Requires:      openssl-tools >= 0.9.8i-3
 %endif