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

Accepting request 544679 from home:RBrownSUSE:branches:Base:System

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544679
OBS-URL: https://build.opensuse.org/package/show/Base:System/dmraid?expand=0&rev=55
This commit is contained in:
Neil Brown 2017-11-23 22:54:39 +00:00 committed by Git OBS Bridge
parent a73ce1024a
commit cc316203ad
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmraid.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:39:52 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 26 21:02:43 UTC 2017 - mwilck@suse.com Thu Oct 26 21:02:43 UTC 2017 - mwilck@suse.com

11
dmraid.spec
View File

@ -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: dmraid Name: dmraid
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -118,8 +123,8 @@ 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/%_lib/libdmraid.a
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
install -m644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/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
install -d %{buildroot}%{_tmpfilesdir} install -d %{buildroot}%{_tmpfilesdir}
echo 'd /run/lock/dmraid 0700 root root -' > %{buildroot}%{_tmpfilesdir}/dmraid.conf echo 'd /run/lock/dmraid 0700 root root -' > %{buildroot}%{_tmpfilesdir}/dmraid.conf
@ -153,7 +158,7 @@ chmod -x %{buildroot}%{_prefix}/include/dmraid/*h
/sbin/dmevent_tool /sbin/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/*
/var/adm/fillup-templates/sysconfig.dmraid %{_fillupdir}/sysconfig.dmraid
/%{_lib}/libdmraid-events-isw.so /%{_lib}/libdmraid-events-isw.so
/%{_lib}/libdmraid.so.1.0.0.rc16-3 /%{_lib}/libdmraid.so.1.0.0.rc16-3
%dir %{_tmpfilesdir} %dir %{_tmpfilesdir}