Author: jajcus Date: Tue May 25 07:15:30 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- without_avahi bcond and BR: avahi-compat-libdns_sd-devel
- ntpdsim man page did not 'disappear', we just don't build ntpdsim
---- Files affected:
packages/ntp:
ntp.spec (1.136 -> 1.137) , ntp-no_avahi.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.136 packages/ntp/ntp.spec:1.137
--- packages/ntp/ntp.spec:1.136 Tue May 25 08:59:14 2010
+++ packages/ntp/ntp.spec Tue May 25 09:15:25 2010
@@ -1,9 +1,12 @@
# $Revision$, $Date$
# TODO:
-# - ntpdseem.1 manual page 'disappeared'
# - package ntpsnmpd - NTP SNMP MIB agent:
# /usr/sbin/ntpsnmpd
# /usr/share/man/man1/ntpsnmpd.1.gz
+# - enable and package ntpdsim?
+#
+# Conditional build:
+%bcond_without avahi # disable DNS-SD support via Avahi
#
%include /usr/lib/rpm/macros.perl
Summary: Network Time Protocol utilities
@@ -31,6 +34,7 @@
Patch3: %{name}-openssl_check.patch
Patch4: %{name}-nano.patch
Patch5: %{name}-ntpdc-link_order.patch
+Patch6: %{name}-no_avahi.patch
# FC patches + 100
Patch101: %{name}-4.2.6p1-sleep.patch
Patch102: %{name}-4.2.6p1-droproot.patch
@@ -48,6 +52,7 @@
URL: http://www.ntp.org/
BuildRequires: autoconf
BuildRequires: automake
+%{?with_avahi:BuildRequires: avahi-compat-libdns_sd-devel}
BuildRequires: libcap-devel
BuildRequires: libtool
BuildRequires: openssl-devel >= 0.9.7d
@@ -202,6 +207,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%{!?with_avahi:%patch6 -p1}
## FC patches
%patch101 -p1
@@ -353,7 +359,6 @@
%attr(755,root,root) %{_sbindir}/tickadj
%{_mandir}/man1/ntpd.1*
%{_mandir}/man1/ntpdc.1*
-#%{_mandir}/man1/ntpdsim.1*
%{_mandir}/man1/ntp-keygen.1*
%{_mandir}/man1/ntpq.1*
%{_mandir}/man1/ntptime.1*
@@ -391,6 +396,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.137 2010/05/25 07:15:25 jajcus
+- without_avahi bcond and BR: avahi-compat-libdns_sd-devel
+- ntpdsim man page did not 'disappear', we just don't build ntpdsim
+
Revision 1.136 2010/05/25 06:59:14 jajcus
- TODO cosmetics
================================================================
Index: packages/ntp/ntp-no_avahi.patch
diff -u /dev/null packages/ntp/ntp-no_avahi.patch:1.1
--- /dev/null Tue May 25 09:15:31 2010
+++ packages/ntp/ntp-no_avahi.patch Tue May 25 09:15:25 2010
@@ -0,0 +1,17 @@
+--- ntp-4.2.6p1/configure.ac.orig 2010-05-25 08:52:27.000000000 +0200
++++ ntp-4.2.6p1/configure.ac 2010-05-25 09:05:44.000000000 +0200
+@@ -416,14 +416,6 @@
+
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(bstring.h)
+-AC_CHECK_HEADER(dns_sd.h,
+- [AC_CHECK_LIB(dns_sd,
+- DNSServiceRegister,
+- [AC_DEFINE(HAVE_DNSREGISTRATION, 1,
+- [Use Rendezvous/DNS-SD registration])])])
+-case "$ac_cv_lib_dns_sd_DNSServiceRegister" in
+- yes) LIBS="-ldns_sd $LIBS" ;;
+-esac
+ AC_CHECK_HEADERS(errno.h fcntl.h ieeefp.h kvm.h math.h)
+
+ AC_CHECK_HEADERS(md5.h, [], [],
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.spec?r1=1.136&r2=1.137&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
