Bump version for release, clean up wrong versions in changelog.

[certmaster.git] / certmaster.spec

diff --git a/certmaster.spec b/certmaster.spec
index ba581a6..58d3ed8 100644 (file)
--- a/certmaster.spec
+++ b/certmaster.spec
@@ -60,13 +60,15 @@ rm -fr $RPM_BUILD_ROOT
 %config(noreplace) /etc/certmaster/certmaster.conf
 %config(noreplace) /etc/logrotate.d/certmaster_rotate
 %dir %{python_sitelib}/certmaster
-%dir %{python_sitelib}/certmaster/minion
-%dir %{python_sitelib}/certmaster/overlord
-%{python_sitelib}/certmaster/minion/*.py*
-%{python_sitelib}/certmaster/overlord/*.py*
 %{python_sitelib}/certmaster/*.py*
 %dir /var/log/certmaster
 %dir /var/lib/certmaster
+%dir /var/lib/certmaster/triggers/sign/pre
+%dir /var/lib/certmaster/triggers/sign/post
+%dir /var/lib/certmaster/triggers/request/pre
+%dir /var/lib/certmaster/triggers/request/post
+%dir /var/lib/certmaster/triggers/remove/pre
+%dir /var/lib/certmaster/triggers/remove/post
 %doc AUTHORS README LICENSE
 %{_mandir}/man1/*.1.gz
 
@@ -74,11 +76,9 @@ rm -fr $RPM_BUILD_ROOT
 %post
 # for suse 
 if [ -x /usr/lib/lsb/install_initd ]; then
-  /usr/lib/lsb/install_initd /etc/init.d/certmasterd
   /usr/lib/lsb/install_initd /etc/init.d/certmaster
 # for red hat distros
 elif [ -x /sbin/chkconfig ]; then
-  /sbin/chkconfig --add certmasterd
   /sbin/chkconfig --add certmaster
 # or, the old fashioned way
 else
@@ -93,22 +93,31 @@ exit 0
 
 %preun
 if [ "$1" = 0 ] ; then
-  /etc/init.d/certmasterd stop  > /dev/null 2>&1
   /etc/init.d/certmaster stop  > /dev/null 2>&1
   if [ -x /usr/lib/lsb/remove_initd ]; then
-    /usr/lib/lsb/remove_initd /etc/init.d/certmasterd
     /usr/lib/lsb/remove_initd /etc/init.d/certmaster
   elif [ -x /sbin/chkconfig ]; then
-    /sbin/chkconfig --del certmasterd
     /sbin/chkconfig --del certmaster
   else
-    rm -f /etc/rc.d/rc?.d/???certmasterd
     rm -f /etc/rc.d/rc?.d/???certmaster
   fi
 fi
 
 
 %changelog
-* Thu Feb 7 2008 Michael DeHaan <mdehaan@redhat.com> - 0.1-1
+* Tue Apr 15 2008 Michael DeHaan <mdehaan@redhat.com> - 0.20-1
+- new release
+- fix changelog versions
+
+* Tue Apr 15 2008 Steve Salevan <ssalevan@redhat.com> - 0.19-3
+- added in trigger directories
+
+* Mon Mar 17 2008 Adrian Likins <alikins@redhat.com> - 0.19-2
+- removed unused minion/ and overlord/ dirs
+
+* Mon Feb 25 2008 Adrian Likins <alikins@redhat.com> - 0.19-1
+- remove certmasterd references
+
+* Thu Feb 7 2008 Michael DeHaan <mdehaan@redhat.com> - 0.18-1
 - initial version, split off from func project, WIP