Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2014-07-21 21:40:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd" Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2014-03-21 13:29:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes 2014-07-21 22:35:01.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jul 20 19:37:18 UTC 2014 - [email protected] + +- Do not provide support for systemd and sysvinit on the same system + it's redundant +- Add a rc symlink with systemd service file for backward compatibility + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.QhvZI9/_old 2014-07-21 22:35:02.000000000 +0200 +++ /var/tmp/diff_new_pack.QhvZI9/_new 2014-07-21 22:35:02.000000000 +0200 @@ -1,4 +1,3 @@ -# vim: set sw=4 ts=4 et nu: # # spec file for package collectd # @@ -271,11 +270,12 @@ BuildRequires: systemd %{?systemd_requires} %define has_systemd 1 +%else +PreReq: %insserv_prereq %endif # in case we'd like to split it later: Provides: collectd-perl = %{version}-%{release} PreReq: %fillup_prereq -PreReq: %insserv_prereq # play nice with collectd-beta: Obsoletes: collectd-beta < %{version} Provides: collectd-beta = %{version}-%{release} @@ -676,11 +676,6 @@ # create /var/lib/collectd to add it to the %files section: %__install -d -m 0755 "%{buildroot}%{_localstatedir}/lib/collectd" -# init script: -%__install -D -m 0755 "%{SOURCE1}" "%{buildroot}/etc/init.d/collectd" -%__install -d -m 0755 "%{buildroot}/usr/sbin" -%__ln_s "../../etc/init.d/collectd" "%{buildroot}/usr/sbin/rccollectd" - # Apache2 configuration for the CGI frontend: %__install -D -m 0644 "%{SOURCE2}" "%{buildroot}/etc/apache2/conf.d/%{name}.conf" %__install -D -m 0755 contrib/collection.cgi "%{buildroot}/srv/www/collectd/collection.cgi" @@ -767,8 +762,15 @@ This package is empty but depends on all collectd plugin subpackages. EOF +%__install -d -m 0755 "%{buildroot}/usr/sbin" + %if 0%{?has_systemd} %__install -D -m0644 %{SOURCE100} %{buildroot}%{_unitdir}/collectd.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} +%else +# init script: +%__install -D -m 0755 "%{SOURCE1}" "%{buildroot}/etc/init.d/collectd" +%__ln_s "../../etc/init.d/collectd" "%{buildroot}/usr/sbin/rccollectd" %endif %preun @@ -844,10 +846,11 @@ %doc %{_mandir}/man5/types.db.5%{ext_man} %doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}%{ext_man} %dir %{_localstatedir}/lib/collectd -/etc/init.d/collectd /usr/sbin/rccollectd %if 0%{?has_systemd} %{_unitdir}/collectd.service +%else +/etc/init.d/collectd %endif %files web -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
