- without_avahi bcond and BR: avahi-compat-libdns_sd-devel

- ntpdsim man page did not 'disappear', we just don't build ntpdsim

Changed files:
    ntp-no_avahi.patch -> 1.1
    ntp.spec -> 1.137

diff --git a/ntp-no_avahi.patch b/ntp-no_avahi.patch
new file mode 100644 (file)
index 0000000..f97fbfa
--- /dev/null
+++ b/ntp-no_avahi.patch
@@ -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, [], [],

diff --git a/ntp.spec b/ntp.spec
index d5a869d88c54d1db7babbcf5e278e1555545c3dc..e4ced172ae28481d1f9de52112a00b3d716c3696 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -1,8 +1,11 @@
 # 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
@@ -30,6 +33,7 @@ Patch2:               %{name}-ipv6.patch
 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
@@ -47,6 +51,7 @@ Patch114:     %{name}-4.2.6p1-mlock.patch
 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
@@ -201,6 +206,7 @@ Este pacote contém documentação adicional sobre o NTP versão 4.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%{!?with_avahi:%patch6 -p1}
 
 ## FC patches
 %patch101 -p1
@@ -352,7 +358,6 @@ fi
 %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*