From efe9a8a5f6996c5163e782c885bef5023e973b834daa1a7f1473787b51a564dd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 4 Nov 2019 12:38:19 +0000 Subject: [PATCH] Accepting request 743099 from home:adkorte - Change to BuildRequires: rubygem(asciidoctor) and remove conditional (is available in SLE12-SP4 and SLE15* as well) - Fix typo in %install OBS-URL: https://build.opensuse.org/request/show/743099 OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=75 --- chrony.changes | 7 +++++++ chrony.spec | 10 ++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/chrony.changes b/chrony.changes index cf907e7..c3d292f 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Oct 26 10:39:29 UTC 2019 - Arjen de Korte + +- Change to BuildRequires: rubygem(asciidoctor) and remove conditional + (is available in SLE12-SP4 and SLE15* as well) +- Fix typo in %install + ------------------------------------------------------------------- Tue Oct 22 21:18:58 UTC 2019 - Arjen de Korte diff --git a/chrony.spec b/chrony.spec index 83fbe8c..7570bfb 100644 --- a/chrony.spec +++ b/chrony.spec @@ -58,18 +58,12 @@ BuildRequires: pps-tools-devel # removed if the call to make check is ever deleted. BuildRequires: timezone BuildRequires: pkgconfig(systemd) +BuildRequires: rubygem(asciidoctor) Requires: logrotate Requires(post): %fillup_prereq Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd Provides: ntp-daemon -# asciidoctor to create html docs, only available on Leap 15.0 ++ -%if 0%{?suse_version} == 1500 && 0%{?is_opensuse} && !0%{?is_backports} -BuildRequires: ruby2.5-rubygem-asciidoctor -%endif -%if %{?suse_version} >= 1550 -BuildRequires: ruby2.6-rubygem-asciidoctor -%endif %ifarch s390 s390x ppc64le BuildRequires: libseccomp-devel >= 2.2.0 %else @@ -168,7 +162,7 @@ install -Dpm 0644 %{SOURCE6} \ install -Dpm 0644 %{SOURCE11} \ %{buildroot}%{_tmpfilesdir}/%{name}.conf -install -d %{buildroot}%{sbindir} +install -d %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchronyd ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchrony-wait