SPECS: ca-certificates.spec - use global /etc/certs dir - removed Debian ru...

baggins baggins at pld-linux.org
Sat Nov 1 12:21:19 CET 2008


Author: baggins                      Date: Sat Nov  1 11:21:19 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use global /etc/certs dir
- removed Debian run-parts

---- Files affected:
SPECS:
   ca-certificates.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/ca-certificates.spec
diff -u SPECS/ca-certificates.spec:1.6 SPECS/ca-certificates.spec:1.7
--- SPECS/ca-certificates.spec:1.6	Wed Oct 29 09:44:43 2008
+++ SPECS/ca-certificates.spec	Sat Nov  1 12:21:13 2008
@@ -1,25 +1,22 @@
 # $Revision$, $Date$
 # TODO
 # - keep one: certificates.spec vs ca-certificates.spec
-# - get rid (or update our rc-scripts) debianized run-parts
-# - use global certs dir or sth
 Summary:	Common CA Certificates PEM files
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 Version:	20080809
-Release:	0.1
+Release:	0.2
 # is it license name or should be unified? ("distributable"?)
 License:	freedist
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
 # Source0-md5:	c155f5059006b94ad0aea7018161ab37
+Patch0:		%{name}-undebianize.patch
 URL:		http://www.cacert.org/
 # for temp files
 Requires:	mktemp
 # for c_rehash
 Requires:	openssl-tools-perl
-# for /bin/run-parts
-Requires:	rc-scripts >= 0.4.1.25
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,7 +31,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},/etc/ssl/certs,%{_sysconfdir}/ca-certificates/update.d}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},/etc/certs}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -44,7 +41,7 @@
 find . -name '*.crt' | sort | cut -b3-
 ) > $RPM_BUILD_ROOT%{_sysconfdir}/ca-certificates.conf
 
-touch $RPM_BUILD_ROOT/etc/ssl/certs/ca-certificates.crt
+touch $RPM_BUILD_ROOT/etc/certs/ca-certificates.crt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,11 +51,8 @@
 
 %files
 %defattr(644,root,root,755)
-%dir /etc/ssl/certs
-%config(noreplace) %verify(not md5 mtime size) /etc/ssl/certs/ca-certificates.crt
-# remove noreplace?
+%config(noreplace) %verify(not md5 mtime size) /etc/certs/ca-certificates.crt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ca-certificates.conf
-%dir %{_sysconfdir}/ca-certificates/update.d
 %attr(755,root,root) %{_sbindir}/update-ca-certificates
 %{_datadir}/ca-certificates
 
@@ -68,6 +62,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2008/11/01 11:21:13  baggins
+- use global /etc/certs dir
+- removed Debian run-parts
+
 Revision 1.6  2008/10/29 08:44:43  glen
 - there can be only one!
 
================================================================

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



More information about the pld-cvs-commit mailing list