[ntp/f18] use system libopts
Miroslav Lichvar
mlichvar at fedoraproject.org
Fri Nov 23 16:44:58 UTC 2012
commit 19a2bc3f420a38742007435548046344bb601d23
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Thu Nov 22 16:51:36 2012 +0100
use system libopts
ntp.spec | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/ntp.spec b/ntp.spec
index f8afe15..3334541 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -18,7 +18,6 @@ Release: 6%{?dist}
# libntp/memmove.c : BSD with advertising
# libntp/ntp_rfc2553.c : BSD with advertising
# libntp/adjtimex.c (not used) : BSD
-# libopts/ : BSD or GPLv2+
# libparse/ : BSD
# ntpd/refclock_jjy.c: MIT
# ntpd/refclock_oncore.c : BEERWARE License (aka, Public Domain)
@@ -27,6 +26,7 @@ Release: 6%{?dist}
# ntpd/refclock_mx4200.c : BSD with advertising
# ntpd/refclock_palisade.h : BSD with advertising
# ntpstat-0.2/ : GPLv2
+# sntp/libopts/ (not used) : BSD or GPLv3+
# util/ansi2knr.c (not used) : GPL+
License: (MIT and BSD and BSD with advertising) and GPLv2
Group: System Environment/Daemons
@@ -97,7 +97,7 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
Requires: ntpdate = %{version}-%{release}
BuildRequires: libcap-devel openssl-devel libedit-devel perl-HTML-Parser
-BuildRequires: pps-tools-devel
+BuildRequires: pps-tools-devel autogen-libopts-devel
%description
The Network Time Protocol (NTP) is used to synchronize a computer's
@@ -198,7 +198,8 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
--sysconfdir=%{_sysconfdir}/ntp/crypto \
--with-openssl-libdir=%{_libdir} \
--enable-all-clocks --enable-parse-clocks \
- --enable-ntp-signd=%{_localstatedir}/run/ntp_signd
+ --enable-ntp-signd=%{_localstatedir}/run/ntp_signd \
+ --disable-local-libopts
echo '#define KEYFILE "%{_sysconfdir}/ntp/keys"' >> ntpdate/ntpdate.h
echo '#define NTP_VAR "%{_localstatedir}/log/ntpstats/"' >> config.h
More information about the scm-commits
mailing list