SPECS: ca-certificates.spec - rel 1 - allow placing ca certs also in /etc/c...

[baggins]

Author: baggins                      Date: Sat Nov  1 18:22:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 1
- allow placing ca certs also in /etc/certs
- use /etc/openssl for symlinks and stuff

---- Files affected:
SPECS:
   ca-certificates.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/ca-certificates.spec
diff -u SPECS/ca-certificates.spec:1.8 SPECS/ca-certificates.spec:1.9
--- SPECS/ca-certificates.spec:1.8	Sat Nov  1 13:16:10 2008
+++ SPECS/ca-certificates.spec	Sat Nov  1 19:22:04 2008
@@ -1,11 +1,9 @@
 # $Revision$, $Date$
-# TODO
-# - keep one: certificates.spec vs ca-certificates.spec
 Summary:	Common CA Certificates PEM files
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 Version:	20080809
-Release:	0.2
+Release:	1
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -38,6 +36,7 @@
 # Source13-md5:	99ef61d509539af89f1c025b67245965
 Patch0:		%{name}-undebianize.patch
 Patch1:		%{name}-more-certs.patch
+Patch2:		%{name}-etc-certs.patch
 URL:		http://www.cacert.org/
 BuildRequires:	ruby
 BuildRequires:	unzip
@@ -57,6 +56,7 @@
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 unzip %{SOURCE1} '*_b64.txt' -d thawte/
 for I in thawte/{,*/}*.txt; do
@@ -88,7 +88,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},/etc/certs}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},/etc/openssl}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -98,7 +98,7 @@
 find . -name '*.crt' | sort | cut -b3-
 ) > $RPM_BUILD_ROOT%{_sysconfdir}/ca-certificates.conf
 
-touch $RPM_BUILD_ROOT/etc/certs/ca-certificates.crt
+touch $RPM_BUILD_ROOT/etc/openssl/ca-certificates.crt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,7 +108,7 @@
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/certs/ca-certificates.crt
+%config(noreplace) %verify(not md5 mtime size) /etc/openssl/ca-certificates.crt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ca-certificates.conf
 %attr(755,root,root) %{_sbindir}/update-ca-certificates
 %{_datadir}/ca-certificates
@@ -119,6 +119,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2008/11/01 18:22:04  baggins
+- rel 1
+- allow placing ca certs also in /etc/certs
+- use /etc/openssl for symlinks and stuff
+
 Revision 1.8  2008/11/01 12:16:10  baggins
 - added Certum and Thawte bundles for certificates.spec
 - obsolete certificates
================================================================

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