Accepting request 544674 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/544674
OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=104
This commit is contained in:
Dirk Mueller 2017-11-24 10:21:55 +00:00 committed by Git OBS Bridge
parent 658a744b4d
commit 4de1c70e56
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:39:24 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Sat Jul 22 07:21:45 UTC 2017 - tchvatal@suse.com

11
at.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: at
Version: 3.1.20
Release: 0
@ -108,7 +113,7 @@ autoreconf -fvi
make %{?_smp_mflags}
%install
install -d %{buildroot}{%{_sysconfdir}/pam.d,%{_bindir},%{_sbindir},%{_mandir}/man{1,5,8},%{_localstatedir}/adm/fillup-templates}
install -d %{buildroot}{%{_sysconfdir}/pam.d,%{_bindir},%{_sbindir},%{_mandir}/man{1,5,8},%{_fillupdir}}
export CFLAGS="%{?optflags}"
export SENDMAIL=%{_sbindir}/sendmail
@ -123,7 +128,7 @@ install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/atd.service
ln -s service %{buildroot}%{_sbindir}/rcatd
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/atd
install -m644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates
install -m644 %{SOURCE3} %{buildroot}%{_fillupdir}
%pre
%{_sbindir}/groupadd -g 25 -o -r at 2> /dev/null || :
@ -160,7 +165,7 @@ install -m644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates
%attr(700,at,at) %dir %{_localstatedir}/spool/atspool
%attr(1770,at,at) %dir %{_localstatedir}/spool/atjobs
%attr(600,at,at) %{_localstatedir}/spool/atjobs/.SEQ
%{_localstatedir}/adm/fillup-templates/sysconfig.atd
%{_fillupdir}/sysconfig.atd
%{_unitdir}/atd.service
%changelog