Accepting request 544754 from home:RBrownSUSE:branches:network:time

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

OBS-URL: https://build.opensuse.org/request/show/544754
OBS-URL: https://build.opensuse.org/package/show/network:time/ptpd?expand=0&rev=13
This commit is contained in:
Martin Pluskal 2017-11-23 15:11:41 +00:00 committed by Git OBS Bridge
parent fb9077308a
commit fb1d47b302
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:47:12 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 13 10:40:49 UTC 2016 - mpluskal@suse.com Wed Jul 13 10:40:49 UTC 2016 - mpluskal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ptpd # spec file for package ptpd
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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: ptpd Name: ptpd
Version: 2.3.1 Version: 2.3.1
Release: 0 Release: 0
@ -73,7 +78,7 @@ autoreconf -fiv
install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}2.service install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}2.service
ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}2 ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}2
install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}2.conf install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}2.conf
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.ptpd2 install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.ptpd2
# have to create the below, else ptpd will not log drift # have to create the below, else ptpd will not log drift
install -d %{buildroot}%{_localstatedir}/log install -d %{buildroot}%{_localstatedir}/log
touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift
@ -101,7 +106,7 @@ touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift
%{_mandir}/man8/ptpd2.8%{ext_man} %{_mandir}/man8/ptpd2.8%{ext_man}
%{_datadir}/ptpd %{_datadir}/ptpd
%{_libexecdir}/systemd/system/ptpd2.service %{_libexecdir}/systemd/system/ptpd2.service
%{_localstatedir}/adm/fillup-templates/* %{_fillupdir}/*
%config %ghost %{_localstatedir}/log/ptpd2_kernelclock.drift %config %ghost %{_localstatedir}/log/ptpd2_kernelclock.drift
%changelog %changelog