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

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

OBS-URL: https://build.opensuse.org/request/show/544684
OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=68
This commit is contained in:
Thomas Renninger 2017-11-24 14:25:26 +00:00 committed by Git OBS Bridge
parent 159953ce7f
commit a2413b1cf3
2 changed files with 15 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:40:17 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Wed Mar 1 16:17:07 UTC 2017 - fschnizlein@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package irqbalance
#
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -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: irqbalance
Version: 1.2.0
Release: 0
@ -60,8 +65,8 @@ cp %{SOURCE3} .
%install
%make_install
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/
install -m 0644 sysconfig.irqbalance %{buildroot}%{_localstatedir}/adm/fillup-templates/
mkdir -p %{buildroot}%{_fillupdir}/
install -m 0644 sysconfig.irqbalance %{buildroot}%{_fillupdir}/
sed -ie "s|EnvironmentFile=.*|EnvironmentFile=%{_sysconfdir}/sysconfig/irqbalance|g" misc/irqbalance.service
# Remove syslog.target in systemd service file; not provided by systemd anymore
sed -ie "s|After=syslog.target||g" misc/irqbalance.service
@ -88,6 +93,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcirqbalance
%{_sbindir}/rcirqbalance
%{_unitdir}/irqbalance.service
%{_mandir}/man1/irqbalance.1.gz
%{_localstatedir}/adm/fillup-templates/sysconfig.irqbalance
%{_fillupdir}/sysconfig.irqbalance
%changelog