summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-10 03:23:34 +0000
committerlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-10 03:23:34 +0000
commita676e082433611c733c646dc0ebc52db47d51255 (patch)
tree97f6f57b3f47ca31970a67b3b9073251e74eb978
parent965a82dd16f5479c505f12867fed1c88e2e8ae91 (diff)
downloadpuppet-a676e082433611c733c646dc0ebc52db47d51255.tar.gz
puppet-a676e082433611c733c646dc0ebc52db47d51255.tar.xz
puppet-a676e082433611c733c646dc0ebc52db47d51255.zip
Sync with latest in Fedora repo
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2066 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--conf/redhat/puppet.spec13
1 files changed, 8 insertions, 5 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index 6f2f3c4d9..d7f525c59 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -115,25 +115,28 @@ exit 0
%preun
if [ "$1" = 0 ] ; then
- /sbin/service puppet stop > /dev/null 2>&1
- /sbin/chkconfig --del puppet
+ /sbin/service puppet stop > /dev/null 2>&1
+ /sbin/chkconfig --del puppet
fi
%preun server
if [ "$1" = 0 ] ; then
- /sbin/service puppetmaster stop > /dev/null 2>&1
- /sbin/chkconfig --del puppetmaster
+ /sbin/service puppetmaster stop > /dev/null 2>&1
+ /sbin/chkconfig --del puppetmaster
fi
%postun server
if [ "$1" -ge 1 ]; then
- /sbin/service puppetmaster condrestart > /dev/null 2>&1
+ /sbin/service puppetmaster condrestart > /dev/null 2>&1
fi
%clean
%{__rm} -rf %{buildroot}
%changelog
+* Fri Jan 5 2007 David Lutterkort <dlutter@redhat.com> - 0.22.0-1
+- New version
+
* Mon Nov 20 2006 David Lutterkort <dlutter@redhat.com> - 0.20.1-2
- Make require ruby(abi) and buildarch: noarch conditional for fedora 5 or
later to allow building on older fedora releases