rpms/puppet/EL-4 puppet-0.25.5.tar.gz.sign, NONE, 1.1 .cvsignore, 1.27, 1.28 puppet.spec, 1.33, 1.34 sources, 1.28, 1.29 puppet-0.25.1-0002-Correct-rundir-permissions.patch, 1.1, NONE puppet-0.25.4.tar.gz.sign, 1.1, NONE
Todd M. Zullinger
tmz at fedoraproject.org
Thu May 20 14:03:41 UTC 2010
- Previous message: rpms/puppet/EL-5 puppet-0.25.5.tar.gz.sign, NONE, 1.1 .cvsignore, 1.29, 1.30 puppet.spec, 1.35, 1.36 sources, 1.30, 1.31 puppet-0.25.1-0002-Correct-rundir-permissions.patch, 1.1, NONE puppet-0.25.4.tar.gz.sign, 1.1, NONE
- Next message: rpms/apache-commons-net/devel apache-commons-net.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tmz
Update of /cvs/extras/rpms/puppet/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2757
Modified Files:
.cvsignore puppet.spec sources
Added Files:
puppet-0.25.5.tar.gz.sign
Removed Files:
puppet-0.25.1-0002-Correct-rundir-permissions.patch
puppet-0.25.4.tar.gz.sign
Log Message:
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
--- NEW FILE puppet-0.25.5.tar.gz.sign ---
-----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-----
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/EL-4/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore 31 Jan 2010 15:17:53 -0000 1.27
+++ .cvsignore 20 May 2010 14:03:40 -0000 1.28
@@ -1 +1 @@
-puppet-0.25.4.tar.gz
+puppet-0.25.5.tar.gz
Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/EL-4/puppet.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- puppet.spec 31 Jan 2010 15:17:54 -0000 1.33
+++ puppet.spec 20 May 2010 14:03:41 -0000 1.34
@@ -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 certif
%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
%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 at 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 at pobox.com> - 0.25.4-1
- Update to 0.25.4
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/EL-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources 31 Jan 2010 15:17:54 -0000 1.28
+++ sources 20 May 2010 14:03:41 -0000 1.29
@@ -1 +1 @@
-69c97019fda5620f9f45f6ad64407e3b puppet-0.25.4.tar.gz
+2988385801c967f7262cdf08640c9e07 puppet-0.25.5.tar.gz
--- puppet-0.25.1-0002-Correct-rundir-permissions.patch DELETED ---
--- puppet-0.25.4.tar.gz.sign DELETED ---
- Previous message: rpms/puppet/EL-5 puppet-0.25.5.tar.gz.sign, NONE, 1.1 .cvsignore, 1.29, 1.30 puppet.spec, 1.35, 1.36 sources, 1.30, 1.31 puppet-0.25.1-0002-Correct-rundir-permissions.patch, 1.1, NONE puppet-0.25.4.tar.gz.sign, 1.1, NONE
- Next message: rpms/apache-commons-net/devel apache-commons-net.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list