Hello community, here is the log from the commit of package ocfs2-tools for openSUSE:Factory checked in at 2018-08-20 16:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old) and /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocfs2-tools" Mon Aug 20 16:19:03 2018 rev:71 rq:629233 version:1.8.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2017-12-14 11:01:50.630984485 +0100 +++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 2018-08-20 16:19:04.248792860 +0200 @@ -1,0 +2,7 @@ +Mon Apr 30 13:49:06 UTC 2018 - [email protected] + +- fix pre/post/preun/postun scripts when systemd_enabled +- insserv_prereq is only needed when !systemd_enabled +- run fillup to actually provision /etc/sysconfig/o2cb + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.mmt1oV/_old 2018-08-20 16:19:04.820793667 +0200 +++ /var/tmp/diff_new_pack.mmt1oV/_new 2018-08-20 16:19:04.824793673 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocfs2-tools # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,7 @@ Version: 1.8.5 Release: 0 Summary: Oracle Cluster File System 2 Core Tools -License: GPL-2.0 +License: GPL-2.0-only Group: System/Filesystems Url: https://ocfs2.wiki.kernel.org/ Source: ocfs2-tools-%{version}.tar.gz @@ -72,7 +72,6 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libxml-2.0) Requires(pre): %fillup_prereq -Requires(pre): %insserv_prereq Requires: /sbin/chkconfig Requires: e2fsprogs Requires: glib2 >= 2.2.3 @@ -81,9 +80,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: ocfs2-kmp %if 0%{?suse_version} >= 1315 - %define systemd_enabled 1 +%define systemd_enabled 1 %else - %define systemd_enabled 0 +%define systemd_enabled 0 +Requires(pre): %insserv_prereq %endif %description @@ -224,14 +224,34 @@ %if 0%{_ocfs2console} == 1 python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')" %endif + +%if %{systemd_enabled} +%pre o2cb +%service_add_pre ocfs2.service o2cb.service +%endif + %preun o2cb +%if %{systemd_enabled} +%service_del_preun ocfs2.service o2cb.service +%else %stop_on_removal ocfs2 %stop_on_removal o2cb +%endif + +%post o2cb +%fillup_only -n o2cb +%if %{systemd_enabled} +%service_add_post ocfs2.service o2cb.service +%endif %postun o2cb +%if %{systemd_enabled} +%service_del_postun ocfs2.service o2cb.service +%else %{insserv_cleanup} %restart_on_update ocfs2 %restart_on_update o2cb +%endif %files %defattr(-,root,root)
