Merge branch 'master' of ssh://alikins@git.fedoraproject.org/git/hosted/certmaster

[certmaster.git] / certmaster.spec

diff --git a/certmaster.spec b/certmaster.spec
index 8dc5ef3..f12ec2b 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
 
@@ -84,7 +86,7 @@ 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
@@ -103,9 +105,23 @@ fi
 
 
 %changelog
-* Mon Feb 25 2008 Adrian Likins <alikins@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.1-1
+* Thu Feb 7 2008 Michael DeHaan <mdehaan@redhat.com> - 0.18-1
 - initial version, split off from func project, WIP