From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 1 Nov 2008 11:21:13 +0000 (+0000)
Subject: - use global /etc/certs dir
X-Git-Tag: auto/th/ca-certificates-20080809-0_2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=commitdiff_plain;h=4619b3d922eb6cc04ae6b792e084b000068c3222;hp=a110f4b755e103e691cde7b2c4268ef5348b4e3c

- use global /etc/certs dir
- removed Debian run-parts

Changed files:
    ca-certificates.spec -> 1.7
---

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 1b7536a..d1834d8 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,24 +1,21 @@
 # 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)
 
@@ -33,7 +30,7 @@ Pliki PEM popularnych certyfikatów CA.
 
 %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
@@ -43,7 +40,7 @@ cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
 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
@@ -53,10 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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