From 7423b231b54ede53ca7bdabcea87fe3432f0d72529d1240c8a4b33f815d87f20 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 1 Feb 2017 11:44:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=27 --- chrony.spec | 23 ++++++++++------------- clknetsim-ce89a1b.tar.gz | 4 ++-- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/chrony.spec b/chrony.spec index b8a4d39..3edd3fb 100644 --- a/chrony.spec +++ b/chrony.spec @@ -17,6 +17,7 @@ %define vendorzone opensuse. +%global clknetsim_ver ce89a1b %if 0%{?suse_version} > 1230 %bcond_without systemd %bcond_without syscallfilter @@ -24,8 +25,6 @@ %bcond_with systemd %bcond_with syscallfilter %endif -%global clknetsim_ver ce89a1b - Name: chrony Version: 3.1 Release: 0 @@ -42,7 +41,6 @@ Source5: chrony-dnssrv@.service Source6: chrony-dnssrv@.timer # Simulator for test suite Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz - # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: chrony-config.patch # Add NTP servers from DHCP when starting service @@ -56,11 +54,16 @@ BuildRequires: gcc-c++ BuildRequires: libcap-devel BuildRequires: libedit-devel BuildRequires: mozilla-nss-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig # The timezone package is needed for the "make check" tests. It can be # removed if the call to make check is ever deleted. BuildRequires: timezone - +Requires: logrotate +Requires(pre): %fillup_prereq +Requires(pre): %{_sbindir}/groupadd +Requires(pre): %{_sbindir}/useradd +Provides: ntp-daemon +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with syscallfilter} %ifarch s390 s390x ppc64le BuildRequires: libseccomp-devel >= 2.2.0 @@ -74,12 +77,6 @@ BuildRequires: pkgconfig(systemd) %else Requires(pre): %insserv_prereq %endif -Requires: logrotate -Requires(pre): %fillup_prereq -Requires(pre): %{_sbindir}/groupadd -Requires(pre): %{_sbindir}/useradd -Provides: ntp-daemon -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Chrony is an implementation of the Network Time Protocol (NTP). It can @@ -164,8 +161,8 @@ install -m 644 -p examples/chrony-wait.service \ %{buildroot}%{_unitdir}/chrony-wait.service install -m 644 -p %{SOURCE5} %{buildroot}%{_unitdir}/chrony-dnssrv@.service install -m 644 -p %{SOURCE6} %{buildroot}%{_unitdir}/chrony-dnssrv@.timer -ln -s /usr/sbin/service "%{buildroot}%{_sbindir}/rcchronyd" -ln -s /usr/sbin/service "%{buildroot}%{_sbindir}/rcchrony-wait" +ln -s %{_sbindir}/service "%{buildroot}%{_sbindir}/rcchronyd" +ln -s %{_sbindir}/service "%{buildroot}%{_sbindir}/rcchrony-wait" echo 'chronyd.service' > \ %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list diff --git a/clknetsim-ce89a1b.tar.gz b/clknetsim-ce89a1b.tar.gz index 381245c..c948d30 100644 --- a/clknetsim-ce89a1b.tar.gz +++ b/clknetsim-ce89a1b.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cdf8e6eba53ec335020b8eaf7141c4cddf886f94f8ca2a2d41c43ff856ae262 -size 42107 +oid sha256:b0896e582bfd6a4b09e6ac24188072d136889e8a0d5d155d0834212284917ec8 +size 41404