packages: certmaster/certmaster.spec - sync with fc spec

[glen]

Author: glen                         Date: Sun Oct 10 18:05:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sync with fc spec

---- Files affected:
packages/certmaster:
   certmaster.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/certmaster/certmaster.spec
diff -u packages/certmaster/certmaster.spec:1.2 packages/certmaster/certmaster.spec:1.3
--- packages/certmaster/certmaster.spec:1.2	Mon Dec 21 14:17:04 2009
+++ packages/certmaster/certmaster.spec	Sun Oct 10 20:05:44 2010
@@ -5,7 +5,7 @@
 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
@@ -36,11 +36,14 @@
 	--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
@@ -64,32 +67,47 @@
 %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
-
-%dir /var/log/certmaster
-%dir /var/lib/certmaster
+%if "%{py_ver}" > "2.4"
+%{py_sitescriptdir}/certmaster-*.egg-info
+%endif
+
+%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
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/10/10 18:05:44  glen
+- sync with fc spec
+
 Revision 1.2  2009/12/21 13:17:04  matik
 - upped to 0.25
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/certmaster/certmaster.spec?r1=1.2&r2=1.3&f=u