X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;f=certmaster.spec;h=f12ec2b115507f7568b967a4d7c7a50f77c4b8dd;hb=7bcf299ccedeb8d22b163f24657eb801cd31bbd9;hp=ba581a6928a2e566767b16f387af32ebb2717138;hpb=9713ae6bad871bc151d378d3d837f09d6e646832;p=certmaster.git

diff --git a/certmaster.spec b/certmaster.spec
index ba581a6..f12ec2b 100644
--- 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
@@ -86,29 +86,42 @@ else
         ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster
    done
    for i in 1 6; do
-        ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster
+        ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/k01certmaster
    done
 fi
 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
+* Mon Jun 6 2008 Adrian Likins <alikins@redhat.com> - 0.20-2
+- fix fedora bug #441283 - typo in postinstall scriptlet
+  (the init.d symlinks for runlevels 1 and 6 were created wrong)
+
+* 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