Accepting request 544666 from home:RBrownSUSE:branches:network

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

OBS-URL: https://build.opensuse.org/request/show/544666
OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=74
This commit is contained in:
Dirk Mueller 2017-11-24 10:22:37 +00:00 committed by Git OBS Bridge
parent 58a816103f
commit 4d87a21408
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:38:46 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Wed Aug 16 10:34:13 CEST 2017 - kukuk@suse.de

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: rpcbind
Version: 0.2.3
Release: 0
@ -106,8 +111,8 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now"
%install
make install DESTDIR=$RPM_BUILD_ROOT
# fillup template
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/
mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_fillupdir}/
mkdir -p $RPM_BUILD_ROOT%_datadir/omc/svcinfo.d
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%_datadir/omc/svcinfo.d/
#
@ -144,7 +149,7 @@ exit 0
/sbin/rpcinfo
%{_sbindir}/rcrpcbind
%{_mandir}/*/*
/var/adm/fillup-templates/sysconfig.rpcbind
%{_fillupdir}/sysconfig.rpcbind
%{_datadir}/omc/svcinfo.d/rpcbind.xml
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket