Hello community, here is the log from the commit of package puppet for openSUSE:12.3 checked in at 2013-03-01 07:46:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/puppet (Old) and /work/SRC/openSUSE:12.3/.puppet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "puppet", Maintainer is "VDziewiecki@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/puppet/puppet.changes 2013-01-31 01:34:12.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.puppet.new/puppet.changes 2013-03-01 07:46:19.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 25 07:37:45 UTC 2013 - mlin@suse.com + +- Install puppet*.service accordingly (/usr/lib/systemd for 12.3 + and up or /lib/systemd for older versions). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ puppet.spec ++++++ --- /var/tmp/diff_new_pack.DgDjwr/_old 2013-03-01 07:46:19.000000000 +0100 +++ /var/tmp/diff_new_pack.DgDjwr/_new 2013-03-01 07:46:19.000000000 +0100 @@ -56,6 +56,12 @@ BuildRequires: systemd %endif +%if %suse_version > 1220 +%define _unitdir /usr/lib/systemd +%else +%define _unitdir /lib/systemd +%endif + %description Puppet lets you centrally manage every important aspect of your system using a cross-platform specification language that manages all the @@ -93,7 +99,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/puppet mkdir -p %{buildroot}/%{_fwdefdir} %if 0%{?suse_version} >= 1210 -mkdir -p %{buildroot}/lib/systemd/system +mkdir -p %{buildroot}%{_unitdir}/system %endif install -m0644 ext/redhat/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf install -m0644 conf/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf @@ -104,8 +110,8 @@ install -m 644 %{SOURCE1} %{buildroot}/%{_fwdefdir}/puppetmasterd install -m 644 %{SOURCE2} %{buildroot}/%{_fwdefdir}/puppet %if 0%{?suse_version} >= 1210 -install -m 644 ext/systemd/puppetagent.service %{buildroot}/lib/systemd/system/puppetagent.service -install -m 644 ext/systemd/puppetmaster.service %{buildroot}/lib/systemd/system/puppetmaster.service +install -m 644 ext/systemd/puppetagent.service %{buildroot}%{_unitdir}/system/puppetagent.service +install -m 644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/system/puppetmaster.service %endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates cp %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.puppet @@ -157,7 +163,7 @@ %config %{_fwdefdir}/puppet %{_localstatedir}/adm/fillup-templates/sysconfig.puppet %if 0%{?suse_version} >= 1210 -/lib/systemd/system/puppetagent.service +%{_unitdir}/system/puppetagent.service %endif %files server @@ -168,7 +174,7 @@ %config %{_fwdefdir}/puppetmasterd %{_localstatedir}/adm/fillup-templates/sysconfig.puppetmasterd %if 0%{?suse_version} >= 1210 -/lib/systemd/system/puppetmaster.service +%{_unitdir}/system/puppetmaster.service %endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org