- 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 1b7536a3621c01c68cf627bbbdfce42f07c35beb..d1834d834c3764e1fa0e90e5828c11c5125b2fd8 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,24 +1,21 @@
 # TODO
 # - keep one: certificates.spec vs ca-certificates.spec
 # 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
 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
 # 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
 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)
 
 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
 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
 
 %{__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
 
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -53,10 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %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
 %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
 %attr(755,root,root) %{_sbindir}/update-ca-certificates
 %{_datadir}/ca-certificates