pool/pcp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

OBS-URL: https://build.opensuse.org/request/show/544691
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=59
This commit is contained in:
Dirk Mueller 2017-11-24 10:18:05 +00:00 committed by Git OBS Bridge
parent c1ada6e939
commit 7aa40e3a26
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:41:01 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 30 23:30:36 UTC 2017 - ddiss@suse.com Wed Aug 30 23:30:36 UTC 2017 - ddiss@suse.com

19
pcp.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
BuildRequires: -post-build-checks BuildRequires: -post-build-checks
%if 0%{?suse_version} > 1140 || 0%{?fedora_version} > 14 %if 0%{?suse_version} > 1140 || 0%{?fedora_version} > 14
@ -2230,13 +2235,13 @@ ln -sf /sbin/service $RPM_BUILD_ROOT/%{_sbindir}/rcpmwebd
%endif %endif
# SUSE requires use of %fillup_and_insserv # SUSE requires use of %fillup_and_insserv
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/%{_fillupdir}
mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmlogger \ mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmlogger \
$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.pmlogger $RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmlogger
mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmproxy \ mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmproxy \
$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.pmproxy $RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmproxy
mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmcd \ mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmcd \
$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.pmcd $RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmcd
%else %else
# default chkconfig off for Fedora and RHEL # default chkconfig off for Fedora and RHEL
@ -2807,9 +2812,9 @@ fi
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie
%if 0%{?suse_version} %if 0%{?suse_version}
%{_localstatedir}/adm/fillup-templates/sysconfig.pmlogger %{_fillupdir}/sysconfig.pmlogger
%{_localstatedir}/adm/fillup-templates/sysconfig.pmproxy %{_fillupdir}/sysconfig.pmproxy
%{_localstatedir}/adm/fillup-templates/sysconfig.pmcd %{_fillupdir}/sysconfig.pmcd
%else %else
%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger %config(noreplace) %{_sysconfdir}/sysconfig/pmlogger
%config(noreplace) %{_sysconfdir}/sysconfig/pmproxy %config(noreplace) %{_sysconfdir}/sysconfig/pmproxy