Hello community, here is the log from the commit of package freeipmi for openSUSE:Factory checked in at 2013-10-29 09:24:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freeipmi (Old) and /work/SRC/openSUSE:Factory/.freeipmi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeipmi" Changes: -------- --- /work/SRC/openSUSE:Factory/freeipmi/freeipmi.changes 2013-10-11 11:04:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freeipmi.new/freeipmi.changes 2013-10-29 09:24:59.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 27 19:14:16 UTC 2013 - [email protected] + +- Add systemd support for openSUSE >= 12.3 + +------------------------------------------------------------------- New: ---- bmc-watchdog.service ipmidetectd.service ipmiseld.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeipmi.spec ++++++ --- /var/tmp/diff_new_pack.zppCj7/_old 2013-10-29 09:25:00.000000000 +0100 +++ /var/tmp/diff_new_pack.zppCj7/_new 2013-10-29 09:25:00.000000000 +0100 @@ -31,7 +31,10 @@ Version: %{version} Release: %{release} Url: http://www.gnu.org/software/freeipmi/ -Source: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 +Source1: bmc-watchdog.service +Source2: ipmidetectd.service +Source3: ipmiseld.service Summary: FreeIPMI License: GPL-3.0+ Group: System/Management @@ -43,6 +46,9 @@ %if 0%{?suse_version} > 1010 BuildRequires: fdupes %endif +%if 0%{?suse_version} >=1230 +BuildRequires: pkgconfig(systemd) +%endif Obsoletes: freeipmi-ipmimonitoring BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,6 +76,9 @@ Group: System/Management %if 0%{?suse_version} Requires(pre): %fillup_prereq +%if 0%{?suse_version} >=1230 +%{?systemd_requires} +%endif %endif Requires: freeipmi = %{version} %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} @@ -89,6 +98,9 @@ Requires(post): chkconfig Requires(preun): chkconfig %endif +%if 0%{?suse_version} >=1230 +%{?systemd_requires} +%endif %description ipmidetectd This service detects and monitors IPMI nodes. @@ -143,6 +155,13 @@ (cd %{buildroot}/%{_sysconfdir}; rm init.d) %endif +# Add systemd support for openSUSE >= 12.3 +%if 0%{?suse_version} >=1230 +mkdir -p %{buildroot}%{_unitdir} +%{__install} -m 0755 %{S:1} %{S:2} %{S:3} %{buildroot}%{_unitdir}/ +rm -r %{buildroot}%{_initddir} +%endif + # fix coherance problems with associated script filenames rm -f %{buildroot}%{_infodir}/dir # kludge to get around rpmlint complaining about 0 length semephore file @@ -160,9 +179,6 @@ %fdupes $RPM_BUILD_ROOT %endif -%clean -rm -rf %{buildroot} - %post if [ -x /sbin/install-info ]; then #/sbin/install-info %{_infodir}/freeipmi.info.gz %{_infodir}/dir @@ -184,6 +200,9 @@ %if 0%{?suse_version} %{fillup_only} %endif +%if 0%{?suse_version} >=1230 +%service_add_post bmc-watchdog.service +%else if [ "$1" = 1 ]; then if [ -x %{_initddir}/bmc-watchdog ]; then /sbin/chkconfig --add bmc-watchdog @@ -199,8 +218,12 @@ fi fi fi +%endif %preun bmc-watchdog +%if 0%{?suse_version} >=1230 +%service_del_preun bmc-watchdog.service +%else # # Stop bmc-watchdog if it is running # @@ -212,8 +235,12 @@ /sbin/chkconfig --del bmc-watchdog fi fi +%endif %post ipmidetectd +%if 0%{?suse_version} >=1230 +%service_add_post ipmidetectd.service +%else if [ "$1" = 1 ]; then if [ -x %{_initddir}/ipmidetectd ]; then /sbin/chkconfig --add ipmidetectd @@ -229,8 +256,12 @@ fi fi fi +%endif %preun ipmidetectd +%if 0%{?suse_version} >=1230 +%service_del_preun ipmidetectd.service +%else # # Stop ipmidetectd if it is running # @@ -242,6 +273,7 @@ /sbin/chkconfig --del ipmidetectd fi fi +%endif %files %defattr(-,root,root) @@ -292,7 +324,11 @@ #%{_docdir} #%endif %config %{_sysconfdir}/freeipmi/ipmiseld.conf +%if 0%{?suse_version} >=1230 +%{_unitdir}/ipmiseld.service +%else %{_initddir}/ipmiseld +%endif %{_libdir}/libipmiconsole*so.* %{_libdir}/libipmidetect*so.* %{_libdir}/libfreeipmi*so.* @@ -426,7 +462,11 @@ %doc COPYING.bmc-watchdog %doc DISCLAIMER.bmc-watchdog %doc DISCLAIMER.bmc-watchdog.UC +%if 0%{?suse_version} >=1230 +%{_unitdir}/bmc-watchdog.service +%else %config(noreplace) %{_initddir}/bmc-watchdog +%endif %if 0%{?suse_version} %attr(0444,root,root) %config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.bmc-watchdog %else @@ -439,7 +479,11 @@ %files ipmidetectd %defattr(-,root,root) +%if 0%{?suse_version} >=1230 +%{_unitdir}/ipmidetectd.service +%else %config(noreplace) %{_initddir}/ipmidetectd +%endif %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/ipmidetectd.conf %{_sbindir}/ipmidetectd %{_mandir}/man5/ipmidetectd.conf.5* ++++++ bmc-watchdog.service ++++++ [Unit] Description=BMC Watchdog Timer Daemon After=network.target [Service] Type=forking PIDFile=/run/bmc-watchdog.pid EnvironmentFile=-/etc/sysconfig/bmc-watchdog ExecStart=/usr/sbin/bmc-watchdog $OPTIONS [Install] WantedBy=multi-user.target ++++++ ipmidetectd.service ++++++ [Unit] Description=IPMI Node Detection Monitoring Daemon After=network.target [Service] Type=forking ExecStart=/usr/sbin/ipmidetectd [Install] WantedBy=multi-user.target ++++++ ipmiseld.service ++++++ [Unit] Description=IPMI SEL syslog logging daemon After=network.target [Service] Type=forking ExecStart=/usr/sbin/ipmiseld [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
