[packages/ntp] regen libevent, add sntp bcond

glen glen at pld-linux.org
Mon Aug 31 12:06:21 CEST 2015


commit b152587420369ab968f32b62397c02863297f0e9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Aug 31 12:37:21 2015 +0300

    regen libevent, add sntp bcond

 ntp.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ntp.spec b/ntp.spec
index f574ed5..98642c7 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -4,7 +4,8 @@
 # - update FC patches
 #
 # Conditional build:
-%bcond_without	avahi  # disable DNS-SD support via Avahi
+%bcond_without	avahi	# disable DNS-SD support via Avahi
+%bcond_without	sntp	# disable building sntp and sntp/tests
 %bcond_with	seccomp		# enable experimental support for libseccomp sandboxing
 
 %include	/usr/lib/rpm/macros.perl
@@ -53,7 +54,7 @@ BuildRequires:	autogen-devel
 BuildRequires:	automake >= 1:1.10
 %{?with_avahi:BuildRequires:	avahi-compat-libdns_sd-devel}
 BuildRequires:	libcap-devel
-BuildRequires:	libevent-devel >= 2.0
+%{?with_sntp:BuildRequires:	libevent-devel >= 2.0}
 BuildRequires:	libnl-devel
 %{?with_seccomp:BuildRequires:	libseccomp-devel}
 BuildRequires:	libtool
@@ -272,7 +273,12 @@ cd sntp
 %{__aclocal} -I m4 -I libopts/m4 -I libevent/m4
 %{__autoconf}
 %{__automake}
-cd ..
+cd libevent
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+cd ../..
 
 CPPFLAGS="%{rpmcppflags} -I/usr/include/readline"
 %configure \
@@ -280,6 +286,7 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/readline"
 	--enable-linuxcaps \
 	--enable-getifaddrs \
 	%{?with_seccomp:--enable-libseccomp} \
+	%{__with_without sntp} \
 	--enable-ipv6 \
 	--enable-ntp-signd \
 	--with-lineeditlibs=readline \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ntp.git/commitdiff/1a55879d8ec4131851348a970c9c3365a745b2c4



More information about the pld-cvs-commit mailing list