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 + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Thu Oct 17 17:38:43 UTC 2019 - Richard Brown 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