From 1f55fc9eb948882674519b0efd2a5ce1f13a7284e0c6af3a340ab5e1298238bf Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 14 Mar 2018 16:40:50 +0000 Subject: [PATCH] Accepting request 587004 from home:kukuk:branches:network:time - Fix name of fillup template (was never installed before) - Fix Requires for fillup, it's used in post, not pre. OBS-URL: https://build.opensuse.org/request/show/587004 OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=42 --- chrony.changes | 6 ++++++ chrony.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/chrony.changes b/chrony.changes index b710818..cfd8bfd 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 14 15:11:56 CET 2018 - kukuk@suse.de + +- Fix name of fillup template (was never installed before) +- Fix Requires for fillup, it's used in post, not pre. + ------------------------------------------------------------------- Fri Feb 9 10:21:09 UTC 2018 - mpluskal@suse.com diff --git a/chrony.spec b/chrony.spec index 4d351aa..397ea9a 100644 --- a/chrony.spec +++ b/chrony.spec @@ -26,7 +26,7 @@ Name: chrony Version: 3.2 Release: 0 Summary: System Clock Synchronization Client and Server -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Networking/Other URL: http://chrony.tuxfamily.org/ Source: http://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz @@ -56,7 +56,7 @@ BuildRequires: pps-tools-devel BuildRequires: timezone BuildRequires: pkgconfig(systemd) Requires: logrotate -Requires(pre): %fillup_prereq +Requires(post): %fillup_prereq Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd Provides: ntp-daemon @@ -157,7 +157,7 @@ echo 'chronyd.service' > \ %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list install -Dpm 0644 %{SOURCE2} \ - %{buildroot}%{_fillupdir}/sysconfig.chronyd + %{buildroot}%{_fillupdir}/sysconfig.chrony install -Dpm 755 %{SOURCE4} \ %{buildroot}%{_datadir}/chrony-helper @@ -205,7 +205,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/ %{_unitdir}/chrony*.service %{_unitdir}/chrony*.timer %{_sbindir}/rcchrony* -%{_fillupdir}/sysconfig.chronyd +%{_fillupdir}/sysconfig.chrony %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/drift %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc