Accepting request 544778 from home:RBrownSUSE:branches:devel:tools:building

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

OBS-URL: https://build.opensuse.org/request/show/544778
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/distcc?expand=0&rev=12
This commit is contained in:
Martin Pluskal 2017-11-23 15:12:51 +00:00 committed by Git OBS Bridge
parent 7e21c5b971
commit d6025dd5c1
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:49:22 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Wed Jun 14 12:51:30 UTC 2017 - tchvatal@suse.com

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: distcc
Version: 3.2rc1
Release: 0
@ -118,7 +123,7 @@ mkdir -p %{buildroot}/%{_sbindir}
ln -sf service %{buildroot}/%{_sbindir}/rc%{name}d
install -D -m 0644 %{SOURCE2} %{buildroot}/%{_unitdir}/%{name}d.service
# sysconfig
install -Dm 644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}d
install -Dm 644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.%{name}d
# firewall
install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}d
# compat links for env override
@ -189,7 +194,7 @@ rm -rf %{buildroot}%{_docdir}/distcc/INSTALL
%{_mandir}/man1/distccd*
%{_mandir}/man1/include_server*
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/distccd
%{_localstatedir}/adm/fillup-templates/*
%{_fillupdir}/*
%{python_sitearch}/include_server*
%files gui