Update to 0.25.5puppet-0_25_5-1_el4

- Adjust selinux conditional for EL-6
- Apply rundir-perms patch from tarball rather than including it separately
- Update URL's to reflect the new puppetlabs.com domain

6 files changed, 33 insertions, 54 deletions

diff --git a/.cvsignore b/.cvsignore
index aaf3649..725e4bc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-puppet-0.25.4.tar.gz
+puppet-0.25.5.tar.gz
diff --git a/puppet-0.25.1-0002-Correct-rundir-permissions.patch b/puppet-0.25.1-0002-Correct-rundir-permissions.patch
deleted file mode 100644
index 0463dbe..0000000
--- a/puppet-0.25.1-0002-Correct-rundir-permissions.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1c7130844b241c1cc2d6c97545dcf895b310eec5 Mon Sep 17 00:00:00 2001
-From: Jeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>
-Date: Wed, 25 Nov 2009 13:42:59 +0100
-Subject: [PATCH 2/2] Correct rundir permissions
-
----
- lib/puppet/defaults.rb |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
-index 9d992dd..7967877 100644
---- a/lib/puppet/defaults.rb
-+++ b/lib/puppet/defaults.rb
-@@ -62,7 +62,7 @@ module Puppet
-         },
-         :rundir => {
-             :default => rundir,
--            :mode => 01777,
-+            :mode => 0755,
-             :desc => "Where Puppet PID files are kept."
-         },
-         :genconfig => [false,
--- 
-1.6.5.2
-
diff --git a/puppet-0.25.4.tar.gz.sign b/puppet-0.25.4.tar.gz.sign
deleted file mode 100644
index 0929784..0000000
--- a/puppet-0.25.4.tar.gz.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iQIcBAABAgAGBQJLYokwAAoJEP+shliDR6J/Q2YP/Rz7MNMThLBwMlP7rb8AhLub
-0IuOIPeeaJRJIM3Rp/H/CuLaQSg2jOU/NDfhDgMsNLbPdIE748hZ4BLuCAeUoDaa
-LqXGuMLxyTGZF2Y8Jf74+78fcYMyyOoSaVixZl/eE9r3I8P9K7m/ANh/UBstdfFe
-Ai64MHIaXLnNpvkE4JHoa+CKcihNgyk+MYUFBz/KK8QCdpFPDwuaTOo08a22WHhc
-LtnPWOShms26FI9mDg3/wrnorbiJ2r2tCfokXB49F7GP0yHIPyJ8B8A8LrEJFtDt
-00thP7eL6kwK/n3GvpgxTgkSDO6PrYkep+mMy73VeCTdmg/3YwjFld67O16qki97
-y+k9rwKW5QyYbLFs+V2itK/AFBRMv4iKDu/KGKGTF1liTwnGQM8GCa7WuwgrcMV7
-kv4FseJaCFR6YAt3Z6z/l5RknxIgfxym0UQ6n5qKjZ1/PJqFZz0Eq+CmNqFiz11X
-Aqq2WFt0mVn8a6nOw9MCcCQ3mxI7ZVGobqI3C+M3xJDmLTZaTDHp+sIj/kR0szhS
-bSTu0+MhLXxvSXCBMxUkGvSNfxO9Lz9Z988NrLdcyfAzPc9w/ENyvgwu8lhtvuRu
-NIuwnQViiam5cBX4SFC2VjNL0XCfsjVWhxQTIibY8mWViybWenvSwyyyajJuC9SU
-BjCta1BL09L6fJv5Rh/g
-=H0bT
------END PGP SIGNATURE-----
diff --git a/puppet-0.25.5.tar.gz.sign b/puppet-0.25.5.tar.gz.sign
new file mode 100644
index 0000000..8cb537d
--- /dev/null
+++ b/puppet-0.25.5.tar.gz.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iQIcBAABAgAGBQJL8eKBAAoJEP+shliDR6J/INUP/1ge+BehyMcruFXKNyISr8Df
+ZrWVYWs0keUqK2pxx34zeO/MUGbhGMwArxsH2eWcagXgujVZmW104B1EiFjw75Ok
+3+pEjskUSWYoBJ4CpwZ0iJzr2D4L73A27xlzaDahGBd/sjLBwYjv69gs8EWdtBug
+bvWIfJ2nbcMzipCY77JxECAcbqhVzEi/6hkrUs4bisXN4atiiPihEbBWdlCwS+Pw
+nBTxZVqrTC/y7e+nxRtEvX0O3LZTAibfzE89SJX3YWVPSoUiR90jB/DWhPVaJEzr
+0X1V3D79IE2gs2EO+S7JsoQfnWgVYGBYQmUGi9a3ZfDppo7aa4dDRTdQWHsF4bac
+jHXkVFB1RV+nVF6O19YTbgrXcG5b/YcUEVqGXB+NvSDSrrF+aRoahFS4x+0HqK+h
+DbnCv2ykPoCE/q7obbrYgx71pfskU4GEtL+rwtuynxMItq3E1lW0ZpQWt30+LwDW
+tjMPrtsjuk/h48d79AbEWl3PPme5SZUfReQUcAs+yt0Y1yxjmvmAKzu0HQgJDtZL
+io5JJ38zdMqtL7FLvnr6cK/rLDWz10yuvouwV922rghGh2qSFq0RZtt04RTjzcAJ
+W/VVkUeL0BCccTzGX67DgkvRi7DEIGtZuw73M8kCkF/+TqlanHN8vSwRAKCmp3GU
+UqZuvCGmazIIj4JH38/t
+=1DPy
+-----END PGP SIGNATURE-----
diff --git a/puppet.spec b/puppet.spec
index b499a75..5943e70 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -5,15 +5,13 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        0.25.4
+Version:        0.25.5
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
-URL:            http://puppet.reductivelabs.com/
-Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
-Source1:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz.sign
-# https://bugzilla.redhat.com/495096
-Patch0:         puppet-0.25.1-0002-Correct-rundir-permissions.patch
+URL:            http://puppetlabs.com
+Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
+Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
 
 Group:          System Environment/Base
 
@@ -29,10 +27,10 @@ Requires:       ruby-shadow
 %endif
 
 # Pull in ruby selinux bindings where available
-%if 0%{?fedora}
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %{!?_without_selinux:Requires: ruby(selinux)}
 %else
+%if 0%{?fedora} || 0%{?rhel} >= 5
 %{!?_without_selinux:Requires: libselinux-ruby}
 %endif
 %endif
@@ -68,7 +66,7 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
-%patch0 -p1
+patch -p1 < conf/redhat/rundir-perms.patch
 
 %build
 # Fix some rpmlint complaints
@@ -156,9 +154,9 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/log/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
+%{_mandir}/man5/puppet.conf.5.gz
 %{_mandir}/man8/pi.8.gz
 %{_mandir}/man8/puppet.8.gz
-%{_mandir}/man8/puppet.conf.8.gz
 %{_mandir}/man8/puppetca.8.gz
 %{_mandir}/man8/puppetd.8.gz
 %{_mandir}/man8/ralsh.8.gz
@@ -223,6 +221,12 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Mon May 17 2010 Todd Zullinger <tmz@pobox.com> - 0.25.5-1
+- Update to 0.25.5
+- Adjust selinux conditional for EL-6
+- Apply rundir-perms patch from tarball rather than including it separately
+- Update URL's to reflect the new puppetlabs.com domain
+
 * Fri Jan 29 2010 Todd Zullinger <tmz@pobox.com> - 0.25.4-1
 - Update to 0.25.4
 
diff --git a/sources b/sources
index 90c1c17..592fef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69c97019fda5620f9f45f6ad64407e3b  puppet-0.25.4.tar.gz
+2988385801c967f7262cdf08640c9e07  puppet-0.25.5.tar.gz