From 5a3a4b62985e29e154723b9323cfe08897ac582806806cf2a263cd4088cdd31a Mon Sep 17 00:00:00 2001 From: Mark Post Date: Wed, 29 Nov 2017 19:12:44 +0000 Subject: [PATCH] Accepting request 544827 from home:RBrownSUSE:branches:devel:openSUSE:Factory Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544827 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/libica?expand=0&rev=19 --- libica.changes | 6 ++++++ libica.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libica.changes b/libica.changes index 15b1ca6..7050379 100644 --- a/libica.changes +++ b/libica.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:53:22 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Wed Oct 4 19:22:58 UTC 2017 - mpost@suse.com diff --git a/libica.spec b/libica.spec index cdc85d7..dee8ac7 100644 --- a/libica.spec +++ b/libica.spec @@ -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: libica BuildRequires: autoconf BuildRequires: automake @@ -115,7 +120,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/include make DESTDIR=$RPM_BUILD_ROOT install cp -p include/ica_api.h $RPM_BUILD_ROOT/usr/include cp -a SuSE/* $RPM_BUILD_ROOT -install -D %{S:5} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.z90crypt +install -D %{S:5} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.z90crypt cp -a $RPM_SOURCE_DIR/README.SUSE . rm -f $RPM_BUILD_ROOT/%{_libdir}/libica.la @@ -141,7 +146,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libica.la %doc README.SUSE COPYING LICENSE %{_initddir}/boot.z90crypt %{_sbindir}/rcz90crypt -%attr(0644,root,root) /var/adm/fillup-templates/sysconfig.z90crypt +%attr(0644,root,root) %{_fillupdir}/sysconfig.z90crypt %{_bindir}/icainfo %{_bindir}/icastats %{_mandir}/man1/icainfo.1.gz