Hello community,
here is the log from the commit of package puppet for openSUSE:Factory checked
in at 2012-06-26 17:21:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/puppet (Old)
and /work/SRC/openSUSE:Factory/.puppet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "puppet", Maintainer is "vdziewie...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/puppet/puppet.changes 2012-06-14
21:10:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.puppet.new/puppet.changes 2012-06-26
17:21:56.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Jun 19 13:28:37 UTC 2012 - bo...@steki.net
+
+- update to upstream 2.7.16 version
+ * Significantly improve compilation performance when using modules
+ * Add Puppet::Util::Platform to abstract platform checks
+ * Default autoflushing of log files to true
+ * Add Module Tool
+ * bugfix releases for all bugs please read
+ /usr/share/doc/packages/puppet/CHANGELOG
+
+-------------------------------------------------------------------
+Thu Jun 14 22:41:53 UTC 2012 - bo...@steki.net
+
+- updated to new upstream 2.7.11 version
+ * for bugfixes informations please look in
+ /usr/share/doc/packages/puppet/CHANGELOG
+
+
+-------------------------------------------------------------------
Old:
----
puppet-2.6.6-init.diff
puppet-2.7.6.tar.gz
New:
----
puppet-2.7.16-init.diff
puppet-2.7.16.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ puppet.spec ++++++
--- /var/tmp/diff_new_pack.HzWFEr/_old 2012-06-26 17:21:57.000000000 +0200
+++ /var/tmp/diff_new_pack.HzWFEr/_new 2012-06-26 17:21:57.000000000 +0200
@@ -16,28 +16,36 @@
#
+# backward compatible requirement SLE...
+%{?!_initddir:%define _initddir %_initrddir}
+
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Name: puppet
-Version: 2.7.6
+Version: 2.7.16
Release: 0
-Url: http://reductivelabs.com/projects/puppet/
-Source: %{name}-%{version}.tar.gz
+Summary: A network tool for managing many disparate systems
+License: Apache-2.0
+Group: Productivity/Networking/System
+Url: http://puppetlabs.com/puppet/what-is-puppet/
+Source:
http://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz
Source1: puppetmaster.fw
Source2: puppet.fw
Source3: puppet.sysconfig
Source4: puppetmasterd.sysconfig
-Patch: %{name}-2.6.6-yumconf.diff
-Patch1: %{name}-2.6.6-init.diff
-Requires: facter >= 1.5.1
-Requires: ruby >= 1.8.1
-PreReq: pwdutils %insserv_prereq %fillup_prereq
+# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch0: %{name}-2.6.6-yumconf.diff
+# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch1: %{name}-2.7.16-init.diff
BuildRequires: facter >= 1.5.1
+BuildRequires: fdupes
BuildRequires: ruby >= 1.8.1
+Requires: facter >= 1.5.1
+Requires: ruby >= 1.8.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: A network tool for managing many disparate systems
-License: Apache-2.0
-Group: Productivity/Networking/System
+Requires(pre): %fillup_prereq
+Requires(pre): %insserv_prereq
+Requires(pre): pwdutils
%description
Puppet lets you centrally manage every important aspect of your system
@@ -46,13 +54,13 @@
cron jobs, and hosts, along with obviously discrete elements like
packages, services, and files.
-
-
%package server
-PreReq: puppet = %{version}-%{release} %insserv_prereq %fillup_prereq
Summary: A network tool for managing many disparate systems
License: GPL-2.0
Group: Productivity/Networking/System
+Requires(pre): %fillup_prereq
+Requires(pre): %insserv_prereq
+Requires(pre): puppet = %{version}
%description server
Puppet lets you centrally manage every important aspect of your system
@@ -61,37 +69,33 @@
cron jobs, and hosts, along with obviously discrete elements like
packages, services, and files.
-
-
%prep
%setup -q
-%patch
+%patch0
%patch1
-#sed -i 's#/usr/local/bin/ruby#/usr/bin/ruby#' lib/puppet/external/nagios.rb
%build
%install
ruby install.rb install --destdir=%{buildroot}
--sitelibdir=%{_libdir}/ruby/vendor_ruby/%{rb_ver}
-#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
-mkdir -p $RPM_BUILD_ROOT/var/lib/puppet
-#mkdir -p $RPM_BUILD_ROOT/var/run/puppet
-mkdir -p $RPM_BUILD_ROOT/var/log/puppet
-mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
-install -m0644 conf/redhat/puppet.conf $RPM_BUILD_ROOT/etc/puppet/puppet.conf
-install -m0644 conf/auth.conf $RPM_BUILD_ROOT/etc/puppet/auth.conf
-install -m0755 conf/suse/client.init $RPM_BUILD_ROOT/etc/init.d/puppet
-install -m0755 conf/suse/server.init $RPM_BUILD_ROOT/etc/init.d/puppetmasterd
-ln -sf ../../etc/init.d/puppet $RPM_BUILD_ROOT/%{_sbindir}/rcpuppet
-ln -sf ../../etc/init.d/puppetmasterd
$RPM_BUILD_ROOT/%{_sbindir}/rcpuppetmasterd
-install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_fwdefdir}/puppetmasterd
-install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_fwdefdir}/puppet
-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
+mkdir -p %{buildroot}%{_sysconfdir}/puppet
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+mkdir -p %{buildroot}/sbin
+mkdir -p %{buildroot}%{_localstatedir}/lib/puppet
+mkdir -p %{buildroot}%{_localstatedir}/log/puppet
+mkdir -p %{buildroot}/%{_fwdefdir}
+install -m0644 conf/redhat/puppet.conf
%{buildroot}%{_sysconfdir}/puppet/puppet.conf
+install -m0644 conf/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf
+install -m0755 conf/suse/client.init %{buildroot}%{_initddir}/puppet
+install -m0755 conf/suse/server.init %{buildroot}%{_initddir}/puppetmasterd
+ln -sf ../../etc/init.d/puppet %{buildroot}/%{_sbindir}/rcpuppet
+ln -sf ../../etc/init.d/puppetmasterd %{buildroot}/%{_sbindir}/rcpuppetmasterd
+install -m 644 %{SOURCE1} %{buildroot}/%{_fwdefdir}/puppetmasterd
+install -m 644 %{SOURCE2} %{buildroot}/%{_fwdefdir}/puppet
+mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+cp %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.puppet
+cp %{SOURCE4}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.puppetmasterd
+%fdupes -s %{buildroot}/%{_mandir}
%pre
getent group puppet >/dev/null || /usr/sbin/groupadd -o -r puppet
@@ -126,32 +130,30 @@
%{_bindir}/pi
%{_bindir}/puppetdoc
%{_sbindir}/puppetca
-%dir %{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet
-%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/*
+%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/
%{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet.rb
%{_libdir}/ruby/vendor_ruby/%{rb_ver}/semver.rb
-%dir /etc/puppet
-%dir /var/lib/puppet
-%dir /var/log/puppet
-#%dir /var/run/puppet
-%config /etc/puppet/puppet.conf
-%config /etc/puppet/auth.conf
+%dir %{_sysconfdir}/puppet
+%dir %{_localstatedir}/lib/puppet
+%dir %{_localstatedir}/log/puppet
+%config %{_sysconfdir}/puppet/puppet.conf
+%config %{_sysconfdir}/puppet/auth.conf
%{_mandir}/man?/*
-/etc/init.d/puppet
+%{_sysconfdir}/init.d/puppet
%{_sbindir}/rcpuppet
%{_sbindir}/puppetd
%config %{_fwdefdir}/puppet
-/var/adm/fillup-templates/sysconfig.puppet
+%{_localstatedir}/adm/fillup-templates/sysconfig.puppet
%files server
%defattr(-, root, root, 0755)
-%dir %attr(755,root,root) /var/lib/puppet
+%dir %attr(755,root,root)
%{_sbindir}/puppetmasterd
%{_sbindir}/puppetrun
%{_sbindir}/puppetqd
%{_sbindir}/rcpuppetmasterd
-/etc/init.d/puppetmasterd
+%{_sysconfdir}/init.d/puppetmasterd
%config %{_fwdefdir}/puppetmasterd
-/var/adm/fillup-templates/sysconfig.puppetmasterd
+%{_localstatedir}/adm/fillup-templates/sysconfig.puppetmasterd
%changelog
++++++ puppet-2.6.6-init.diff -> puppet-2.7.16-init.diff ++++++
--- /work/SRC/openSUSE:Factory/puppet/puppet-2.6.6-init.diff 2011-09-23
12:42:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.puppet.new/puppet-2.7.16-init.diff
2012-06-26 17:21:56.000000000 +0200
@@ -1,7 +1,7 @@
Index: conf/suse/client.init
===================================================================
---- conf/suse/client.init.orig
-+++ conf/suse/client.init
+--- conf/suse/client.init.orig 2012-05-23 19:01:10.000000000 +0200
++++ conf/suse/client.init 2012-06-19 14:24:37.232819359 +0200
@@ -17,7 +17,7 @@
# Should-Start: puppet
# Required-Stop: $local_fs $remote_fs $network $syslog
@@ -23,7 +23,7 @@
-[ -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
++lockfile=/var/run/lock/puppet
+pidfile=/var/run/puppet.pid
+puppetd=/usr/sbin/puppetd
+
@@ -39,7 +39,16 @@
# First reset status of this service
rc_reset
-@@ -76,7 +81,7 @@ case "$1" in
+@@ -65,6 +70,8 @@ case "$1" in
+ ## Start daemon with startproc(8). If this fails
+ ## the echo return value is set appropriate.
+
++ # create lockfile directory on tmpfs
++ mkdir -p $(dirname ${lockfile})
+ # startproc should return 0, even if service is
+ # already running to match LSB spec.
+ startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch
${lockfile}
+@@ -76,7 +83,7 @@ case "$1" in
## Stop daemon with killproc(8) and if this fails
## set echo the echo return value.
@@ -50,8 +59,8 @@
rc_status -v
Index: conf/suse/server.init
===================================================================
---- conf/suse/server.init.orig
-+++ conf/suse/server.init
+--- conf/suse/server.init.orig 2012-05-23 19:01:10.000000000 +0200
++++ conf/suse/server.init 2012-06-19 14:27:35.409806171 +0200
@@ -15,7 +15,7 @@
# Should-Start: puppetmaster
# Required-Stop: $local_fs $remote_fs $network $syslog
@@ -66,7 +75,7 @@
# rc_exit exit appropriate to overall rc status
-lockfile=/var/lock/subsys/puppetmaster
-+lockfile=/var/lock/subsys/puppetmasterd
++lockfile=/var/run/lock/puppetmasterd
pidfile=/var/run/puppet/puppetmasterd.pid
# Source function library.
@@ -79,7 +88,17 @@
fi
PUPPETMASTER_OPTS=""
-@@ -100,7 +100,7 @@ case "$1" in
+@@ -83,6 +83,9 @@ case "$1" in
+ ## Start daemon with startproc(8). If this fails
+ ## the echo return value is set appropriate.
+
++ # create lockfile location on tmpfs
++ mkdir -p $(dirname ${lockfile})
++
+ # startproc should return 0, even if service is
+ # already running to match LSB spec.
+ # Confirm the manifest exists
+@@ -100,7 +103,7 @@ case "$1" in
## Stop daemon with killproc(8) and if this fails
## set echo the echo return value.
++++++ puppet-2.7.6.tar.gz -> puppet-2.7.16.tar.gz ++++++
++++ 54358 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
