rpm/dmraid
SHA256
1
0
Fork 0
forked from pool/dmraid
Code Pull Requests Activity

Accepting request 849711 from home:lnussel:usrmove

Browse Source 
- 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
This commit is contained in:
Neil Brown 2020-11-25 22:42:28 +00:00 committed by Git OBS Bridge
parent d353412dba
commit 5ebe956598
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dmraid.changes
View File

@ -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> Thu Oct 17 17:38:43 UTC 2019 - Richard Brown <rbrown@suse.com>

27
dmraid.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package dmraid # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
@ -34,7 +40,7 @@ Requires: aaa_base
Requires: kpartx Requires: kpartx
Requires(post): coreutils Requires(post): coreutils
Requires(postun): 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 Summary: A Device-Mapper Software RAID Support Tool
License: GPL-2.0-only License: GPL-2.0-only
Version: 1.0.0.rc16 Version: 1.0.0.rc16
@ -114,15 +120,16 @@ cp %{SOURCE3} .
autoreconf -fi autoreconf -fi
rm -r autom4te.cache rm -r autom4te.cache
%configure \ %configure \
--libdir=/%_lib \ %if !0%{?usrmerged}
--sbindir=/sbin \ --sbindir=%{sbindir} \
%endif
--with-user=`id -nu` --with-group=`id -ng` \ --with-user=`id -nu` --with-group=`id -ng` \
--enable-libselinux --enable-libsepol --enable-libselinux --enable-libsepol
make make
%install %install
make install DESTDIR=$RPM_BUILD_ROOT 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} mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.dmraid install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.dmraid
install -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/dmraid-activation.service install -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/dmraid-activation.service
@ -154,13 +161,13 @@ chmod -x %{buildroot}%{_prefix}/include/dmraid/*h
%files %files
%defattr(-, root, root) %defattr(-, root, root)
/sbin/dmraid %{sbindir}/dmraid
/sbin/dmevent_tool %{sbindir}/dmevent_tool
%{_mandir}/man8/* %{_mandir}/man8/*
%doc LICENSE LICENSE_GPL LICENSE_LGPL README README.SUSE TODO doc/* %doc LICENSE LICENSE_GPL LICENSE_LGPL README README.SUSE TODO doc/*
%{_fillupdir}/sysconfig.dmraid %{_fillupdir}/sysconfig.dmraid
/%{_lib}/libdmraid-events-isw.so %{_libdir}/libdmraid-events-isw.so
/%{_lib}/libdmraid.so.1.0.0.rc16-3 %{_libdir}/libdmraid.so.1.0.0.rc16-3
%dir %{_tmpfilesdir} %dir %{_tmpfilesdir}
%{_tmpfilesdir}/dmraid.conf %{_tmpfilesdir}/dmraid.conf
%{_unitdir}/dmraid-activation.service %{_unitdir}/dmraid-activation.service
@ -169,6 +176,6 @@ chmod -x %{buildroot}%{_prefix}/include/dmraid/*h
%defattr(-, root, root) %defattr(-, root, root)
%dir %{_prefix}/include/dmraid %dir %{_prefix}/include/dmraid
%{_prefix}/include/dmraid %{_prefix}/include/dmraid
/%{_lib}/libdmraid.so %{_libdir}/libdmraid.so
%changelog %changelog