Hello community, here is the log from the commit of package salt-api for openSUSE:Factory checked in at 2013-10-18 19:23:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt-api (Old) and /work/SRC/openSUSE:Factory/.salt-api.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt-api" Changes: -------- --- /work/SRC/openSUSE:Factory/salt-api/salt-api.changes 2013-08-13 13:10:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.salt-api.new/salt-api.changes 2013-10-18 19:25:37.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 18 11:44:15 UTC 2013 - [email protected] + +- Don't support sysvinit and systemd for the same system; add conditionnal + macros to use systemd only on systems which support it and sysvinit + on other systems + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt-api.spec ++++++ --- /var/tmp/diff_new_pack.w4WUkK/_old 2013-10-18 19:25:37.000000000 +0200 +++ /var/tmp/diff_new_pack.w4WUkK/_new 2013-10-18 19:25:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: salt-api Version: 0.8.2 -Release: 1%{?dist} +Release: 0 License: Apache-2.0 Summary: The api for Salt a parallel remote execution system Url: http://saltstack.org/ @@ -44,9 +44,10 @@ %if 0%{?suse_version} >= 1210 BuildRequires: systemd %{?systemd_requires} -%endif -Requires(pre): %fillup_prereq +%else Requires(pre): %insserv_prereq +Requires(pre): %fillup_prereq +%endif %description salt-api is a modular interface on top of Salt that can provide a variety of entry points into a running Salt system. @@ -59,55 +60,58 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%fdupes %{buildroot}%{_prefix} # ##missing directories +%if 0%{?suse_version} < 1210 mkdir -p %{buildroot}%{_sysconfdir}/init.d -mkdir -p %{buildroot}%{_localstatedir}/log/salt mkdir -p %{buildroot}/%{_sbindir} +%endif +mkdir -p %{buildroot}%{_localstatedir}/log/salt # ##init scripts -%if 0%{?sles_version} == 11 +%if 0%{?suse_version} < 1210 install -Dpm 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/salt-api -%else -install -Dpm 0755 %{SOURCE1} %{buildroot}%{_initddir}/salt-api -%endif ln -sf /etc/init.d/salt-api %{buildroot}%{_sbindir}/rcsalt-api - -%if 0%{?_unitdir:1} +%else install -Dpm 644 %{SOURCE2} %{buildroot}%_unitdir/salt-api.service %endif %preun -%stop_on_removal %if 0%{?_unitdir:1} %service_del_preun salt-api.service +%else +%stop_on_removal %endif %post -%fillup_and_insserv %if 0%{?_unitdir:1} %service_add_post salt-api.service +%else +%fillup_and_insserv %endif %postun -%restart_on_update %if 0%{?_unitdir:1} %service_del_postun salt-api.service -%endif +%else %insserv_cleanup +%restart_on_update +%endif %files %defattr(-,root,root) -%{_sysconfdir}/init.d/salt-api -%{_sbindir}/rcsalt-api +%doc LICENSE %if 0%{?_unitdir:1} %_unitdir +%else +%{_sysconfdir}/init.d/salt-api +%{_sbindir}/rcsalt-api %endif -%doc %{_mandir}/man1/salt-api.1.* -%doc %{_mandir}/man7/salt-api.7.* +%{_mandir}/man1/salt-api.1.* +%{_mandir}/man7/salt-api.7.* %{_bindir}/salt-api -%doc LICENSE %{python_sitelib}/* -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
