Hello community, here is the log from the commit of package puppet for openSUSE:Factory checked in at 2014-05-02 14:01:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/puppet (Old) and /work/SRC/openSUSE:Factory/.puppet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "puppet" Changes: -------- --- /work/SRC/openSUSE:Factory/puppet/puppet.changes 2014-04-09 13:15:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.puppet.new/puppet.changes 2014-05-02 14:01:53.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Apr 25 12:45:03 UTC 2014 - vdziewiecki@suse.com + +-Version update: 3.5.1 is a backward-compatible features and fixes release in the Puppet 3 series. It fixes the problems that 3.5.0 caused with dynamic environments and the yumrepo provider, as well as a couple of smaller bugs. + +------------------------------------------------------------------- +Thu Apr 10 07:33:04 CEST 2014 - mhrusecky@suse.cz + +- display update message about systemd service rename only when relevant + +------------------------------------------------------------------- +Wed Apr 9 15:01:54 CEST 2014 - mhrusecky@suse.cz + +- update to puppet 3.5.0, see + * http://docs.puppetlabs.com/puppet/3/reference/release_notes.html + * http://docs.puppetlabs.com/puppet/latest/reference/release_notes.html +- replaced puppet-3.3.1-systemd-units.patch with puppet-3.5.0-systemd-units.patch + * adopted to the latest version +- drooped puppet-2.6.6-yumconf.diff + * doesn't apply anymore and upstream reworked yum module quite extensively + * AFAIK we don't use yum anywhere +- require facter > 1.6.0 as upstream does + +------------------------------------------------------------------- Old: ---- puppet-2.6.6-yumconf.diff puppet-3.3.1.tar.gz New: ---- puppet-3.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ puppet.spec ++++++ --- /var/tmp/diff_new_pack.5jDCIM/_old 2014-05-02 14:01:54.000000000 +0200 +++ /var/tmp/diff_new_pack.5jDCIM/_new 2014-05-02 14:01:54.000000000 +0200 @@ -22,7 +22,7 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: puppet -Version: 3.3.1 +Version: 3.5.1 Release: 0 Summary: A network tool for managing many disparate systems License: Apache-2.0 @@ -32,16 +32,15 @@ Source1: puppetmaster.fw Source2: puppet.fw Source7: puppet.changelog -Patch0: puppet-2.6.6-yumconf.diff # PATCH-FIX_UPSTREAM puppet-3.3.1-systemd-units.patch https://github.com/puppetlabs/puppet/pull/2510 Patch1: puppet-3.3.1-systemd-units.patch Obsoletes: hiera-puppet < 1.0.0 Provides: hiera-puppet >= 1.0.0 -Requires: facter >= 1.6.4 +Requires: facter >= 1.6.0 Requires: rubygem-hiera >= 1.0.0 Requires: ruby >= 1.8.7 Requires: rubygem-ruby-shadow >= 2.1.4 -BuildRequires: facter >= 1.6.11 +BuildRequires: facter >= 1.6.0 BuildRequires: fdupes BuildRequires: ruby >= 1.8.7 BuildRequires: rubygem-hiera >= 1.0.0 @@ -78,8 +77,7 @@ %prep %setup -q -%patch0 -%patch1 +%patch1 -p1 cp %{S:7} ChangeLog %build @@ -99,7 +97,7 @@ install -m 644 %{SOURCE1} %{buildroot}/%{_fwdefdir}/puppetmasterd install -m 644 %{SOURCE2} %{buildroot}/%{_fwdefdir}/puppet # Latest git calls the service for agent puppet again -install -m 644 ext/systemd/puppetagent.service %{buildroot}%{_unitdir}/system/puppet.service +install -m 644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/system/puppet.service install -m 644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/system/puppetmaster.service %fdupes -s %{buildroot}/%{_mandir} @@ -139,6 +137,11 @@ install -Dp -m0644 ext/emacs/puppet-mode-init.el \ $emacsdir/site-start.d/puppet-mode-init.el +%pretrans server +if [ -x /usr/bin/puppet ] && [ "`/usr/bin/puppet --version | grep '^3.3.1'`" ]; then + echo old > /run/puppet_migrate +fi + %pre server getent group puppet >/dev/null || /usr/sbin/groupadd -r puppet getent passwd puppet >/dev/null || /usr/sbin/useradd -r -g puppet -d /var/lib/puppet -s /bin/false -c "Puppet daemon" puppet @@ -172,11 +175,14 @@ echo 'PUPPETMASTER_EXTRA_OPTS=" --manifest=${PUPPETMASTER_MANIFEST} --masterport=${PUPPETMASTER_PORTS[0]} --logdest ${PUPPETMASTER_LOG} ${PUPPETMASTER_EXTRA_OPTS}' >> /etc/sysconfig/puppet fi %service_add_post puppetmaster.service +if [ -f /run/puppet_migrate ]; then cat > %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} << EOF Warning: If you used puppet on openSUSE/SLE before be aware, that service is now Warning: called puppemaster instead of puppetmasterd. This was done to comply Warning: with upstream naming of the service and hopefully with everybody else EOF +rm -f /run/puppet_migrate +fi %files %defattr(-,root,root,-) ++++++ puppet-3.3.1-systemd-units.patch ++++++ --- /var/tmp/diff_new_pack.5jDCIM/_old 2014-05-02 14:01:54.000000000 +0200 +++ /var/tmp/diff_new_pack.5jDCIM/_new 2014-05-02 14:01:54.000000000 +0200 @@ -1,7 +1,7 @@ -Index: ext/systemd/puppetagent.service -=================================================================== ---- ext/systemd/puppetagent.service.orig -+++ ext/systemd/puppetagent.service +diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service +index 6312a05..770db1c 100644 +--- a/ext/systemd/puppet.service ++++ b/ext/systemd/puppet.service @@ -1,13 +1,11 @@ [Unit] Description=Puppet agent @@ -19,10 +19,10 @@ [Install] WantedBy=multi-user.target -Index: ext/systemd/puppetmaster.service -=================================================================== ---- ext/systemd/puppetmaster.service.orig -+++ ext/systemd/puppetmaster.service +diff --git a/ext/systemd/puppetmaster.service b/ext/systemd/puppetmaster.service +index 054e518..8a6f117 100644 +--- a/ext/systemd/puppetmaster.service ++++ b/ext/systemd/puppetmaster.service @@ -4,10 +4,8 @@ Wants=basic.target After=basic.target network.target ++++++ puppet-3.3.1.tar.gz -> puppet-3.5.1.tar.gz ++++++ ++++ 94911 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org