- sync with fc spec

Changed files:
    certmaster.spec -> 1.3

diff --git a/certmaster.spec b/certmaster.spec
index 1405902259a7f39add8e910fbfdde68f21adcaa0..b1d797401a251df2b95a966d314b48019f04124d 100644 (file)
--- a/certmaster.spec
+++ b/certmaster.spec
@@ -4,7 +4,7 @@ Version:        0.25
 Release:       0.1
 Source0:       http://people.fedoraproject.org/~alikins/files/certmaster/%{name}-%{version}.tar.gz
 # Source0-md5: 83d6115f2cff4af18e150274602c71c1
-Source1:       certmaster.init
+Source1:       %{name}.init
 Patch0:                %{name}-setup.patch
 License:       GPL v2+
 Group:         Applications/System
@@ -35,11 +35,14 @@ rm -rf $RPM_BUILD_ROOT
        --optimize=2 \
        --root=$RPM_BUILD_ROOT
 
+%py_postclean
+
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/pki/%{name}/ca
 install -d $RPM_BUILD_ROOT/var/lib/certmaster/triggers/{sign,request,remove}/{pre,post}
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/certmaster
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/certmaster
 
-%py_postclean
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/sign/post/certmaster-sync
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/remove/post/certmaster-sync
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -63,22 +66,34 @@ fi
 %attr(755,root,root) %{_bindir}/certmaster-ca
 %attr(754,root,root) /etc/rc.d/init.d/certmaster
 %dir %{_sysconfdir}/%{name}
-%dir %{_sysconfdir}/%{name}/minion-acl.d/
+%dir %{_sysconfdir}/%{name}/minion-acl.d
 %dir %{_sysconfdir}/pki/%{name}
-%dir %{_sysconfdir}/pki/%{name}/ca
-%config(noreplace) %{_sysconfdir}/certmaster/minion.conf
-%config(noreplace) %{_sysconfdir}/certmaster/certmaster.conf
-%config(noreplace) /etc/logrotate.d/certmaster_rotate
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/certmaster/minion.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/certmaster/certmaster.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/certmaster_rotate
 %{_mandir}/man1/*.1*
 
 %{py_sitescriptdir}/certmaster/*.py[co]
-%{py_sitescriptdir}/*.egg-info
+%if "%{py_ver}" > "2.4"
+%{py_sitescriptdir}/certmaster-*.egg-info
+%endif
 
-%dir /var/log/certmaster
-%dir /var/lib/certmaster
+%attr(700,root,root) %dir /var/lib/certmaster
+%attr(700,root,root) %dir /var/lib/certmaster/certmaster
+%attr(700,root,root) %dir /var/lib/certmaster/certmaster/certs
+%attr(700,root,root) %dir /var/lib/certmaster/certmaster/csrs
+%dir /var/lib/certmaster/peers
+%dir /var/lib/certmaster/triggers/sign
 %dir /var/lib/certmaster/triggers/sign/pre
 %dir /var/lib/certmaster/triggers/sign/post
+%dir /var/lib/certmaster/triggers/request
 %dir /var/lib/certmaster/triggers/request/pre
 %dir /var/lib/certmaster/triggers/request/post
+%dir /var/lib/certmaster/triggers/remove
 %dir /var/lib/certmaster/triggers/remove/pre
 %dir /var/lib/certmaster/triggers/remove/post
+
+%attr(755,root,root) /var/lib/certmaster/triggers/remove/post/certmaster-sync
+%attr(755,root,root) /var/lib/certmaster/triggers/sign/post/certmaster-sync
+
+%dir /var/log/certmaster