Small mods to the packaging stuff

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@851 980ebf18-57e1-0310-9a29-db15c13687c0

4 files changed, 13 insertions, 19 deletions

diff --git a/Rakefile b/Rakefile
index fddfabac6..221a52f4a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -136,7 +136,6 @@ PKG_FILES = FileList[
     'lib/**/*.rb',
     'test/**/*.rb',
     'bin/**/*',
-    'conf/**/*',
     'ext/**/*',
     'examples/**/*'
 ]
@@ -413,7 +412,7 @@ task :rpm do
     sh %{cp conf/redhat/puppet.spec %s/puppet.spec} % basedir
 
     Dir.chdir(basedir) do
-        system("rpmbuild -ba puppet.spec")
+        sh %{rpmbuild -ba puppet.spec}
     end
 
     sh %{mv %s/puppet.spec %s} % [basedir, specdir]
diff --git a/conf/redhat/client.sysconfig b/conf/redhat/client.sysconfig
index 23d114a42..cfe065b33 100644
--- a/conf/redhat/client.sysconfig
+++ b/conf/redhat/client.sysconfig
@@ -1,11 +1,11 @@
-# You must specify the puppetmaster server here
-PUPPET_SERVER=
+# The puppetmaster server
+#PUPPET_SERVER=puppet
 
 # If you wish to specify the port to connect to do so here
-#PUPPET_PORT=8139
+#PUPPET_PORT=8140
 
 # Where to log to. Specify syslog to send log messages to the system log.
 #PUPPET_LOG=syslog
 
 # You may specify other parameters to the puppet client here
-#PUPPET_EXTRA_OPTS=--waitforcert=3600
+#PUPPET_EXTRA_OPTS=--waitforcert=500
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index cdc1bbbc5..1752bdc7f 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -13,12 +13,6 @@ Group: System Environment/Base
 
 URL: http://reductivelabs.com/projects/puppet/
 Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
-Source1: client.init
-Source2: client.sysconfig
-Source3: client.cron
-Source4: server.sysconfig
-Source5: server.init
-Source6: fileserver.conf
 
 Vendor: Reductive Labs
 Packager: Duane Griffin <d.griffin@psenterprise.com>
@@ -46,6 +40,7 @@ The server can also function as a certificate authority and file server.
 %prep
 %setup -q
 
+%{__cp} -p %{confdir}/* %{_sourcedir}
 %{__cp} -p %{confdir}/* .
 
 %install
@@ -58,12 +53,12 @@ The server can also function as a certificate authority and file server.
 %{__install} -Dp -m0755 %{_pbuild}/bin/* %{buildroot}%{_sbindir}
 %{__install} -Dp -m0644 %{_pbuild}/lib/puppet.rb %{buildroot}%{rubylibdir}/puppet.rb
 %{__cp} -a %{_pbuild}/lib/puppet %{buildroot}%{rubylibdir}
-%{__install} -Dp -m0644 client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
-%{__install} -Dp -m0755 client.init %{buildroot}%{_initrddir}/puppet
-%{__install} -Dp -m0644 client.cron %{buildroot}%{_sysconfdir}/cron.hourly/puppet.cron
-%{__install} -Dp -m0644 server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
-%{__install} -Dp -m0755 server.init %{buildroot}%{_initrddir}/puppetmaster
-%{__install} -Dp -m0644 fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
+%{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
+%{__install} -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
+%{__install} -Dp -m0644 %{confdir}/client.cron %{buildroot}%{_sysconfdir}/cron.hourly/puppet.cron
+%{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
+%{__install} -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
+%{__install} -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 
 %files
 %defattr(-, root, root, 0755)
diff --git a/lib/puppet.rb b/lib/puppet.rb
index 1526b3c4b..e8bace1a6 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -13,7 +13,7 @@ require 'puppet/util'
 #
 # it's also a place to find top-level commands like 'debug'
 module Puppet
-    PUPPETVERSION = '0.12.0'
+    PUPPETVERSION = '0.11.2'
 
     def Puppet.version
         return PUPPETVERSION