Hello community,
here is the log from the commit of package ocfs2-tools for openSUSE:Factory
checked in at 2017-11-24 10:56:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
and /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocfs2-tools"
Fri Nov 24 10:56:41 2017 rev:69 rq:545006 version:1.8.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2017-10-23
16:53:44.723411151 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes
2017-11-24 10:56:48.987144199 +0100
@@ -1,0 +2,12 @@
+Thu Nov 23 13:48:49 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+- Correct clearly invalid .changes timestamp
+
+-------------------------------------------------------------------
+Wed Nov 22 10:30:00 UTC 2017 - g...@suse.com
+
+- Remove o2cb resource agent which is obsolete (bsc#1069099)
+
+-------------------------------------------------------------------
Old:
----
o2cb.ocf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocfs2-tools.spec ++++++
--- /var/tmp/diff_new_pack.VoAXrX/_old 2017-11-24 10:56:50.651083431 +0100
+++ /var/tmp/diff_new_pack.VoAXrX/_new 2017-11-24 10:56:50.651083431 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ocfs2-tools
#
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
Name: ocfs2-tools
Version: 1.8.5
Release: 0
@@ -24,8 +29,7 @@
Group: System/Filesystems
Url: https://ocfs2.wiki.kernel.org/
Source: ocfs2-tools-%{version}.tar.gz
-Source1: o2cb.ocf
-Source2: reflink.tar.bz2
+Source1: reflink.tar.bz2
Patch001: auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
Patch103: debug-ocfs2_hb_ctl.patch
Patch105: bug-470741-debug_start_failures.patch
@@ -133,7 +137,7 @@
OCFS2 filesystem.
%prep
-%setup -q -a 2
+%setup -q -a 1
%patch001 -p1
%patch103 -p1
%patch105 -p1
@@ -166,13 +170,10 @@
%install
mkdir -p %{buildroot}/sbin
mkdir -p %{buildroot}%{_prefix}/bin
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_udevrulesdir}
-mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2
cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_udevrulesdir}
-cp -f $RPM_SOURCE_DIR/o2cb.ocf
%{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
-chmod a+x %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
-cp -f vendor/common/o2cb.sysconfig
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
+cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_fillupdir}/sysconfig.o2cb
%if %{systemd_enabled}
mkdir -p %{buildroot}/usr/lib/systemd/system
@@ -244,10 +245,6 @@
%{_mandir}/man5/ocfs2.cluster.conf.5.gz
%{_mandir}/man7/ocfs2.7.gz
%{_mandir}/man1/o2info.1.gz
-%dir %{_prefix}/lib/ocf
-%dir %{_prefix}/lib/ocf/resource.d
-%dir %{_prefix}/lib/ocf/resource.d/ocfs2
-%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
%files -n ocfs2console
%defattr(-,root,root)
@@ -274,7 +271,7 @@
%endif
%{_mandir}/man8/o2cb_ctl.8*
-%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
+%{_fillupdir}/sysconfig.o2cb
%{_mandir}/man7/o2cb.7.gz
%{_mandir}/man8/o2cb.8.gz
