From d353412dba7786e6a03b77b79e08debcf9fa1de26532879fcbc3261ef53aa2a0 Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Fri, 18 Oct 2019 00:17:22 +0000
Subject: [PATCH 1/2] Accepting request 740647 from
 home:RBrownSUSE:branches:Base:System

Remove obsolete Groups tag (fate#326485)

OBS-URL: https://build.opensuse.org/request/show/740647
OBS-URL: https://build.opensuse.org/package/show/Base:System/dmraid?expand=0&rev=59
---
 dmraid.changes | 5 +++++
 dmraid.spec    | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dmraid.changes b/dmraid.changes
index 64939ed..1430a74 100644
--- a/dmraid.changes
+++ b/dmraid.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 17 17:38:43 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Remove obsolete Groups tag (fate#326485)
+
 -------------------------------------------------------------------
 Mon May 27 13:05:45 UTC 2019 - Martin Liška <mliska@suse.cz>
 
diff --git a/dmraid.spec b/dmraid.spec
index 73cac73..7026a2f 100644
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -37,7 +37,6 @@ Requires(postun): coreutils
 Url:            http://people.redhat.com/~heinzm/sw/dmraid/src/
 Summary:        A Device-Mapper Software RAID Support Tool
 License:        GPL-2.0-only
-Group:          System/Base
 Version:        1.0.0.rc16
 Release:        0
 Source:         ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2
@@ -83,7 +82,6 @@ The following ATARAID types are supported:
 
 %package devel
 Summary:        Development files for dmraid
-Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 
 %description devel

From 5ebe9565985e1b8dc3cf7d3d309292c71ee5e449544aa23a445bd0ba7cff352f Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Wed, 25 Nov 2020 22:42:28 +0000
Subject: [PATCH 2/2] Accepting request 849711 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849711
OBS-URL: https://build.opensuse.org/package/show/Base:System/dmraid?expand=0&rev=60
---
 dmraid.changes |  5 +++++
 dmraid.spec    | 27 +++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/dmraid.changes b/dmraid.changes
index 1430a74..778798b 100644
--- a/dmraid.changes
+++ b/dmraid.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 17 13:59:10 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Thu Oct 17 17:38:43 UTC 2019 - Richard Brown <rbrown@suse.com>
 
diff --git a/dmraid.spec b/dmraid.spec
index 7026a2f..4d7e0a2 100644
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dmraid
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,12 @@
 #
 
 
+%if 0%{?usrmerged}
+%define sbindir %_sbindir
+%else
+%define sbindir /sbin
+%endif
+
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir /var/adm/fillup-templates
@@ -34,7 +40,7 @@ Requires:       aaa_base
 Requires:       kpartx
 Requires(post): coreutils
 Requires(postun): coreutils
-Url:            http://people.redhat.com/~heinzm/sw/dmraid/src/
+URL:            http://people.redhat.com/~heinzm/sw/dmraid/src/
 Summary:        A Device-Mapper Software RAID Support Tool
 License:        GPL-2.0-only
 Version:        1.0.0.rc16
@@ -114,15 +120,16 @@ cp %{SOURCE3} .
 autoreconf -fi
 rm -r autom4te.cache
 %configure \
-  --libdir=/%_lib \
-  --sbindir=/sbin \
+%if !0%{?usrmerged}
+  --sbindir=%{sbindir} \
+%endif
   --with-user=`id -nu` --with-group=`id -ng` \
   --enable-libselinux --enable-libsepol
 make
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%_lib/libdmraid.a
+rm -f $RPM_BUILD_ROOT/%_libdir/libdmraid.a
 mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.dmraid
 install -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/dmraid-activation.service
@@ -154,13 +161,13 @@ chmod -x %{buildroot}%{_prefix}/include/dmraid/*h
 
 %files
 %defattr(-, root, root)
-/sbin/dmraid
-/sbin/dmevent_tool
+%{sbindir}/dmraid
+%{sbindir}/dmevent_tool
 %{_mandir}/man8/*
 %doc LICENSE LICENSE_GPL LICENSE_LGPL README README.SUSE TODO doc/*
 %{_fillupdir}/sysconfig.dmraid
-/%{_lib}/libdmraid-events-isw.so
-/%{_lib}/libdmraid.so.1.0.0.rc16-3
+%{_libdir}/libdmraid-events-isw.so
+%{_libdir}/libdmraid.so.1.0.0.rc16-3
 %dir %{_tmpfilesdir}
 %{_tmpfilesdir}/dmraid.conf
 %{_unitdir}/dmraid-activation.service
@@ -169,6 +176,6 @@ chmod -x %{buildroot}%{_prefix}/include/dmraid/*h
 %defattr(-, root, root)
 %dir %{_prefix}/include/dmraid
 %{_prefix}/include/dmraid
-/%{_lib}/libdmraid.so
+%{_libdir}/libdmraid.so
 
 %changelog