Mailinglist Archive: opensuse-commit (1029 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package puppet for openSUSE:Factory
checked in at Fri Jul 1 16:44:47 CEST 2011.



--------
--- puppet/puppet.changes       2011-05-19 11:40:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/puppet/puppet.changes  2011-06-27 
14:16:08.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Jun 23 08:26:59 UTC 2011 - vcizek@xxxxxxxxxx
+
+- update to 2.7.1 
+  - a major feature release:
+    Ruby 1.9 Support
+    Deterministic Catalog Application
+    Puppet Faces - a new API for creating new Puppet subcommands
+    Manage Network Devices
+    Dependency cycle reporting produces graph of the cycle
+- license changed to Apache-2.0
+  - see http://docs.puppetlabs.com/guides/faq#change-to-apache-license
+
+-------------------------------------------------------------------
@@ -4 +17 @@
-- using correct port for puppet in the firewall rules 
+- using correct port for puppet in the firewall rules (bnc#694825)

calling whatdependson for head-i586


Old:
----
  puppet-2.6.6.tar.bz2

New:
----
  puppet-2.7.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ puppet.spec ++++++
--- /var/tmp/diff_new_pack.3BH0Pv/_old  2011-07-01 16:43:36.000000000 +0200
+++ /var/tmp/diff_new_pack.3BH0Pv/_new  2011-07-01 16:43:36.000000000 +0200
@@ -20,22 +20,22 @@
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:           puppet
-Version:        2.6.6
-Release:        4
-License:        GPLv2
+Version:        2.7.1
+Release:        1
+License:        Apache-2.0
 Group:          Productivity/Networking/System
 Url:            http://reductivelabs.com/projects/puppet/
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.gz
 Source1:        puppetmaster.fw
 Source2:        puppet.fw
 Source3:        puppet.sysconfig
 Source4:        puppetmasterd.sysconfig
-Patch:          %{name}-%{version}-yumconf.diff
-Patch1:         %{name}-%{version}-init.diff
+Patch:          %{name}-2.6.6-yumconf.diff
+Patch1:         %{name}-2.6.6-init.diff
 Requires:       ruby >= 1.8.1 
-Requires:       facter >= 1.1.4
+Requires:       facter >= 1.5.1
 PreReq:         pwdutils %insserv_prereq %fillup_prereq 
-BuildRequires:  facter >= 1.1.4
+BuildRequires:  facter >= 1.5.1
 BuildRequires:  ruby >= 1.8.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A network tool for managing many disparate systems
@@ -68,13 +68,13 @@
 %setup -q
 %patch
 %patch1
-sed -i 's#/usr/local/bin/ruby#/usr/bin/ruby#' lib/puppet/external/nagios.rb
+#sed -i 's#/usr/local/bin/ruby#/usr/bin/ruby#' lib/puppet/external/nagios.rb
 
 %build
 
 %install
 DESTDIR=$RPM_BUILD_ROOT ruby -rvendor-specific install.rb install 
--prefix=%{buildroot}
-install -d -m 755 $RPM_BUILD_ROOT/var/lib/puppet
+#install -d -m 755 $RPM_BUILD_ROOT/var/lib/puppet
 mkdir -p $RPM_BUILD_ROOT/etc/puppet
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/sbin
@@ -93,9 +93,9 @@
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.puppet
 cp %{S:4} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.puppetmasterd
-chmod a+x 
$RPM_BUILD_ROOT/%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/external/nagios.rb
-chmod a+x 
$RPM_BUILD_ROOT/%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/network/http_server/mongrel.rb
-chmod a+x 
$RPM_BUILD_ROOT/%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/relationship.rb
+#chmod a+x 
$RPM_BUILD_ROOT/%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/external/nagios.rb
+#chmod a+x 
$RPM_BUILD_ROOT/%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/network/http_server/mongrel.rb
+#chmod a+x 
$RPM_BUILD_ROOT/%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/relationship.rb
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -126,11 +126,11 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING LICENSE README 
-%{_bindir}/pi
+%doc CHANGELOG LICENSE README.*
 %{_bindir}/filebucket
 %{_bindir}/puppet
 %{_bindir}/ralsh
+%{_bindir}/pi
 %{_bindir}/puppetdoc
 %{_sbindir}/puppetca
 %dir %{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet
@@ -154,10 +154,10 @@
 %dir %attr(755,root,root) /var/lib/puppet
 %{_sbindir}/puppetmasterd
 %{_sbindir}/puppetrun
+%{_sbindir}/puppetqd
+%{_sbindir}/rcpuppetmasterd
 /etc/init.d/puppetmasterd
 %config %{_fwdefdir}/puppetmasterd
-%{_sbindir}/rcpuppetmasterd
-%{_sbindir}/puppetqd
 /var/adm/fillup-templates/sysconfig.puppetmasterd
 
 %changelog

++++++ puppet-2.6.6-init.diff ++++++
--- /var/tmp/diff_new_pack.3BH0Pv/_old  2011-07-01 16:43:36.000000000 +0200
+++ /var/tmp/diff_new_pack.3BH0Pv/_new  2011-07-01 16:43:36.000000000 +0200
@@ -2,6 +2,15 @@
 ===================================================================
 --- conf/suse/client.init.orig
 +++ conf/suse/client.init
+@@ -17,7 +17,7 @@
+ # Should-Start: puppet
+ # Required-Stop: $local_fs $remote_fs $network $syslog
+ # Should-Stop: puppet
+-# Default-Start: 3 4 5
++# Default-Start: 3 5
+ # Default-Stop: 0 1 2 6
+ # Short-Description: puppet
+ # Description: Enables periodic system configuration checks through puppet.
 @@ -33,14 +33,19 @@
  #      rc_exit          exit appropriate to overall rc status
  [ -f /etc/rc.status ] && . /etc/rc.status
@@ -9,14 +18,15 @@
 -lockfile=${LOCKFILE-/var/lock/subsys/puppet}
 -pidfile=${PIDFILE-/var/run/puppet.pid}
 -puppetd=${PUPPETD-/usr/sbin/puppetd}
-+lockfile=/var/lock/subsys/puppet
-+pidfile=/var/run/puppet.pid
-+puppetd=/usr/sbin/puppetd
- 
+-
 -PUPPET_OPTS=""
 -[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
 -[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
 -[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
++lockfile=/var/lock/subsys/puppet
++pidfile=/var/run/puppet.pid
++puppetd=/usr/sbin/puppetd
++
 +[ -z "$PUPPET_LOG" ] && PUPPET_LOG="/var/log/puppet/puppet.log"
 +[ -z "$PUPPET_SERVER" ] && PUPPET_SERVER="puppet"
 +[ -z "$PUPPET_PORT" ] && PUPPET_PORT="8140"
@@ -29,10 +39,28 @@
  
  # First reset status of this service
  rc_reset
+@@ -76,7 +81,7 @@ case "$1" in
+         ## Stop daemon with killproc(8) and if this fails
+         ## set echo the echo return value.
+ 
+-        killproc -QUIT $puppetd && rm -f ${lockfile} ${pidfile}
++        killproc $puppetd && rm -f ${lockfile} ${pidfile}
+ 
+         # Remember status and be verbose
+         rc_status -v
 Index: conf/suse/server.init
 ===================================================================
 --- conf/suse/server.init.orig
 +++ conf/suse/server.init
+@@ -15,7 +15,7 @@
+ # Should-Start: puppetmaster
+ # Required-Stop: $local_fs $remote_fs $network $syslog
+ # Should-Stop: puppetmaster
+-# Default-Start: 3 4 5
++# Default-Start: 3 5
+ # Default-Stop: 0 1 2 6
+ # Short-Description: puppetmaster
+ # Description: Server for the puppet system management tool.
 @@ -30,14 +30,14 @@
  #      rc_reset         clear local rc status (overall remains)
  #      rc_exit          exit appropriate to overall rc status
@@ -51,3 +79,12 @@
  fi
  
  PUPPETMASTER_OPTS=""
+@@ -100,7 +100,7 @@ case "$1" in
+         ## Stop daemon with killproc(8) and if this fails
+         ## set echo the echo return value.
+ 
+-        killproc -QUIT $PUPPETMASTER && rm -f ${lockfile} ${pidfile}
++        killproc $PUPPETMASTER && rm -f ${lockfile} ${pidfile}
+ 
+         # Remember status and be verbose
+         rc_status -v


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx