diff options
Diffstat (limited to 'puppet.spec')
| -rw-r--r-- | puppet.spec | 24 |
1 files changed, 14 insertions, 10 deletions
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 |