From 2f7f048893c277d2b6b607b802804859cadb935b Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen <kanarip@fedoraproject.org>
Date: Tue, 16 Dec 2008 08:42:47 +0000
Subject: [PATCH] 0.24.7-1

---
 .cvsignore       |  2 +-
 import.log       |  1 +
 no-lockdir.patch | 13 -------------
 puppet.spec      | 19 +++++++++++--------
 sources          |  2 +-
 5 files changed, 14 insertions(+), 23 deletions(-)
 create mode 100644 import.log
 delete mode 100644 no-lockdir.patch

diff --git a/.cvsignore b/.cvsignore
index ff5ea86..c26606c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-puppet-0.24.6.tgz
+puppet-0.24.7.tgz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..6a11ccc
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+puppet-0_24_7-1_fc10:HEAD:puppet-0.24.7-1.fc10.src.rpm:1229416939
diff --git a/no-lockdir.patch b/no-lockdir.patch
deleted file mode 100644
index 899a202..0000000
--- a/no-lockdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- puppet-0.22.1/conf/redhat/puppetd.conf.orig	2006-09-27 10:30:35.000000000 -0700
-+++ puppet-0.22.1/conf/redhat/puppetd.conf	2007-02-11 13:27:04.000000000 -0800
-@@ -11,10 +11,6 @@
-     # The default value is '$vardir/run'.
-     rundir = /var/run/puppet
- 
--    # Where lock files are kept.
--    # The default value is '$vardir/locks'.
--    lockdir = /var/lock
--
-     # Where SSL certificates are kept.
-     # The default value is '$confdir/ssl'.
-     ssldir = $vardir/ssl
diff --git a/puppet.spec b/puppet.spec
index 718df95..4fd015d 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -2,12 +2,9 @@
 %define confdir conf/redhat
 
 Name:           puppet
-Version:        0.24.6
+Version:        0.24.7
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
-
-Group:          System Environment/Base
-
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
 Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
@@ -21,6 +18,11 @@ Requires:       ruby(abi) = 1.8
 Requires:       ruby-shadow
 %endif
 
+# Pull in libselinux-ruby where it is available
+%if 0%{?fedora} >=9
+Requires:       libselinux-ruby
+%endif
+
 Requires:       facter >= 1.1.4
 Requires:       ruby >= 1.8.1
 Requires(pre):  shadow-utils
@@ -145,12 +147,10 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 %doc %{_mandir}/man8/puppetmasterd.8.gz
 %doc %{_mandir}/man8/puppetrun.8.gz
 
-# Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
-# and 471919 (RHEL-4)
 %pre
-getent group puppet >/dev/null || groupadd -r puppet -g 52
+getent group puppet >/dev/null || groupadd -r puppet
 getent passwd puppet >/dev/null || \
-useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
+useradd -r -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
     -c "Puppet" puppet || :
 # ensure that old setups have the right puppet home dir
 if [ $1 -gt 1 ] ; then
@@ -189,6 +189,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Tue Dec 16 2008 Jeroen van Meeuwen <kanarip@kanarip.com> - 0.24.7-1
+- New upstream version
+
 * Wed Oct 22 2008 Todd Zullinger <tmz@pobox.com> - 0.24.6-1
 - Update to 0.24.6
 - Require ruby-shadow on Fedora and RHEL >= 5
diff --git a/sources b/sources
index 0a43dc7..79aeb04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcc84cd9bc5c411536ab88589079459b  puppet-0.24.6.tgz
+36f57de5c2e069d04752f0539034227d  puppet-0.24.7.tgz