rpms/puppet/FC-5 .cvsignore, 1.9, 1.10 puppet.spec, 1.9, 1.10 sources, 1.9, 1.10

[David Lutterkort (lutter)]

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12332

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.22.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Nov 2006 02:22:39 -0000	1.9
+++ .cvsignore	6 Jan 2007 00:41:26 -0000	1.10
@@ -1 +1 @@
-puppet-0.20.1.tgz
+puppet-0.22.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- puppet.spec	14 Nov 2006 02:22:39 -0000	1.9
+++ puppet.spec	6 Jan 2007 00:41:26 -0000	1.10
@@ -2,9 +2,12 @@
 %define pbuild %{_builddir}/%{name}-%{version}
 %define confdir conf/redhat
 
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.20.1
+Version: 0.22.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -13,10 +16,14 @@
 Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
 
 Requires: ruby >= 1.8.1
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
 Requires: facter >= 1.1.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %has_ruby_noarch
 BuildArchitectures: noarch
+%endif
 BuildRequires: ruby >= 1.8.1
 
 %description
@@ -108,25 +115,32 @@
 
 %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 at redhat.com> - 0.22.0-1
+- New version
+
+* Mon Nov 20 2006 David Lutterkort <dlutter at 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
+
 * Mon Nov 13 2006 David Lutterkort <dlutter at redhat.com> - 0.20.1-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Nov 2006 02:22:39 -0000	1.9
+++ sources	6 Jan 2007 00:41:26 -0000	1.10
@@ -1 +1 @@
-5d4a35b197f6342742bbd3561aac99e8  puppet-0.20.1.tgz
+9d60a93ba44467f551088fc20686edba  puppet-0.22.0.tgz