X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=blobdiff_plain;f=ca-certificates.spec;h=a8513c660cae2033295fd0942d79e3349774a163;hp=58b1e483fe66ce32e077e6c60bafe42f3923a54c;hb=a848160585d3b09be14002e3eeb1f1a76a8efd22;hpb=1180a18f5e0491a879772c73570a83250835ca49

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 58b1e48..a8513c6 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,18 +1,18 @@
 # TODO
 # - cleanup dead links from /etc/openssl/certs after -update uninstall
-#
 # - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
 #   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#
+# - add certs noted in TODO file
 #
 Summary:	Common CA Certificates PEM files
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
-Version:	20110421
-Release:	1
-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:	59edcd927a76cf78ec5bb43f248ea68d
+# Source0-md5:	5105d4cc086f0d4ecf7bf2e4c4667289
 Source1:	https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5:	a3709cc0279ef3fca4f86ea775066b18
 Source2:	http://www.certum.pl/keys/CA.pem
@@ -62,8 +62,8 @@ Patch1:		%{name}-more-certs.patch
 Patch2:		%{name}-etc-certs.patch
 Patch3:		%{name}-c_rehash.sh.patch
 Patch4:		%{name}-endline.patch
-Patch5:		%{name}-mozilla.patch
-Patch6:		%{name}-DESTDIR.patch
+Patch5:		%{name}-DESTDIR.patch
+Patch6:		%{name}.d.patch
 URL:		http://www.cacert.org/
 BuildRequires:	openssl-tools
 BuildRequires:	python
@@ -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
@@ -171,15 +167,14 @@ done
 %{__make}
 
 # We have those and more in specific dirs
-rm mozilla/{Thawte,thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2}*.crt
+rm mozilla/{Thawte,thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2,Juur-SK}*.crt
 
 # See TODO
 # rm mozilla/RSA_Security_1024_v3.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir}}
-
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir},%{_sysconfdir}/ca-certificates.d}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -203,10 +198,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc debian/README.Debian debian/changelog
 %config(noreplace) %verify(not md5 mtime size) %{certsdir}/ca-certificates.crt
 
 %files update
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/update-ca-certificates
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ca-certificates.conf
+%dir %{_sysconfdir}/ca-certificates.d
 %{_datadir}/ca-certificates