SPECS: ca-certificates.spec - rel 3 - move script and source certs to -upda...

[baggins]

Author: baggins                      Date: Mon Nov  3 14:05:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3
- move script and source certs to -update package
- main package no longer requires openssl-tools*

---- Files affected:
SPECS:
   ca-certificates.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/ca-certificates.spec
diff -u SPECS/ca-certificates.spec:1.12 SPECS/ca-certificates.spec:1.13
--- SPECS/ca-certificates.spec:1.12	Sat Nov  1 19:35:42 2008
+++ SPECS/ca-certificates.spec	Mon Nov  3 15:05:32 2008
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 Version:	20080809
-Release:	2
+Release:	3
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -37,12 +37,11 @@
 Patch0:		%{name}-undebianize.patch
 Patch1:		%{name}-more-certs.patch
 Patch2:		%{name}-etc-certs.patch
+Patch3:		%{name}-c_rehash.sh.patch
 URL:		http://www.cacert.org/
 BuildRequires:	ruby
 BuildRequires:	unzip
 Requires:	mktemp
-Requires:	openssl >= 0.9.8i-2
-Requires:	openssl-tools-perl >= 0.9.8i-2
 Requires:	rpm-whiteout >= 1.7
 Obsoletes:	certificates
 BuildArch:	noarch
@@ -54,11 +53,25 @@
 %description -l pl.UTF-8
 Pliki PEM popularnych certyfikatów CA.
 
+%package update
+Summary:	Script for updating CA Certificates database
+Summary(pl.UTF-8):	Skrypt do odświeżania bazy certyfikatów CA
+Group:		Libraries
+Requires:	%{name}
+Requires:	openssl-tools >= 0.9.8i-3
+
+%description update
+Script and data for updating CA Certificates database.
+
+%description -l pl.UTF-8 update
+Skrypt i dane do odświeżania bazy certyfikatów CA.
+
 %prep
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 unzip %{SOURCE1} '*_b64.txt' -d thawte/
 for I in thawte/{,*/}*.txt; do
@@ -100,19 +113,25 @@
 find . -name '*.crt' | sort | cut -b3-
 ) > $RPM_BUILD_ROOT%{_sysconfdir}/ca-certificates.conf
 
-touch $RPM_BUILD_ROOT/etc/openssl/ca-certificates.crt
+(
+cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
+find . -name '*.crt' -print0 | xargs -0 cat
+) > $RPM_BUILD_ROOT%{_sysconfdir}/openssl/ca-certificates.crt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post update
 %{_sbindir}/update-ca-certificates || :
 
 %files
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/openssl/ca-certificates.crt
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ca-certificates.conf
+
+%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
 %{_datadir}/ca-certificates
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -121,6 +140,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008/11/03 14:05:32  baggins
+- rel 3
+- move script and source certs to -update package
+- main package no longer requires openssl-tools*
+
 Revision 1.12  2008/11/01 18:35:42  baggins
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ca-certificates.spec?r1=1.12&r2=1.13&f=u