Accepting request 544706 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/544706
OBS-URL: https://build.opensuse.org/package/show/Base:System/issue-generator?expand=0&rev=7
This commit is contained in:
Thorsten Kukuk 2017-11-23 15:12:59 +00:00 committed by Git OBS Bridge
parent 7b82d1889f
commit f300109c3b
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:42:31 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Wed May 31 15:18:23 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: issue-generator
Version: 1.3
Release: 0
@ -44,8 +49,8 @@ make %{?_smp_mflags}
make %{?_smp_mflags} DESTDIR=%{buildroot} install
ln -sf service %{buildroot}%{_sbindir}/rcissue-generator
ln -sf service %{buildroot}%{_sbindir}/rcissue-add-ssh-keys
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/fillup-templates/
mkdir -p %{buildroot}%{_fillupdir}
install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_fillupdir}/
%fdupes %{buildroot}%{_mandir}
%pre
@ -71,7 +76,7 @@ install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/
%dir %{_prefix}/lib/tmpfiles.d
%dir %{_prefix}/lib/udev
%dir %{_prefix}/lib/udev/rules.d
%{_localstatedir}/adm/fillup-templates/sysconfig.issue-generator
%{_fillupdir}/sysconfig.issue-generator
%{_prefix}/lib/tmpfiles.d/issue-generator.conf
%{_prefix}/lib/udev/rules.d/90-issue-generator.rules
%{_prefix}/lib/systemd/system/issue-add-ssh-keys.service