File project.diff of Package ocfs2-tools

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package ocfs2-tools (Revision fa77d78630418131dd43afc4a2738ae5)

Currently displaying revision fa77d78630418131dd43afc4a2738ae5 , Show latest

--- ocfs2-tools.changes.orig
+++ ocfs2-tools.changes
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Thu Nov 23 13:48:49 UTC 2017 - rbrown@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 - ghe@suse.com
+
+- Remove o2cb resource agent which is obsolete (bsc#1069099)
+
+-------------------------------------------------------------------
 Mon Oct 23 14:25:30 UTC 2017 - ghe@suse.com
 
 - Fix dependencies problem between ocfs2-tools and ocfs2-kmp (bsc#1060601)
--- ocfs2-tools.spec.orig
+++ ocfs2-tools.spec
@@ -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 @@ License:        GPL-2.0
 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 @@ This package contains the tools to manag
 OCFS2 filesystem.
 
 %prep
-%setup -q -a 2
+%setup -q -a 1
 %patch001 -p1
 %patch103 -p1
 %patch105 -p1
@@ -166,13 +170,10 @@ cd ..
 %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 @@ python -c "import compileall; compileall
 %{_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 @@ python -c "import compileall; compileall
 %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

Places

File project.diff of Package ocfs2-tools (Revision fa77d78630418131dd43afc4a2738ae5)

Places