From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 26 Aug 2015 18:23:53 +0000 (+0000)
Subject: Don't try to use Avahi on OS X (STR #4695)
X-Git-Tag: v2.2b1~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7470f0c7dc19f2fb05e350bdad808685ebdd3a2e;p=thirdparty%2Fcups.git

Don't try to use Avahi on OS X (STR #4695)

cupsd-logs man page is in section 5...


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12845 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 6068f76349..498a3a1c7d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.1.0 - 2015-08-13
+CHANGES.txt - 2.1.0 - 2015-08-26
 --------------------------------
 
 CHANGES IN CUPS V2.1.0
@@ -9,6 +9,8 @@ CHANGES IN CUPS V2.1.0
 	  (<rdar://problem/22086642>, <rdar://problem/22130168>)
 	- "make check" incorrectly reported an expectation of 18 warning
 	  messages when 8 were expected (STR #4684)
+	- The configure script did not disable the Avahi test on OS X
+	  (STR #4695)
 
 
 CHANGES IN CUPS V2.1rc1
diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4
index 9207d616f9..3b5bee801f 100644
--- a/config-scripts/cups-dnssd.m4
+++ b/config-scripts/cups-dnssd.m4
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   DNS Service Discovery (aka Bonjour) stuff for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2015 by Apple Inc.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Apple Inc. and are protected by Federal copyright
@@ -26,7 +26,7 @@ DNSSD_BACKEND=""
 IPPFIND_BIN=""
 IPPFIND_MAN=""
 
-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
+if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$uname != xDarwin; then
 	AC_MSG_CHECKING(for Avahi)
 	if $PKGCONFIG --exists avahi-client; then
 		AC_MSG_RESULT(yes)
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index d4e88a7b15..b6e48a32da 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -313,6 +313,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/lpstat.1.gz
 %dir /usr/share/man/man5
 /usr/share/man/man5/*.conf.5.gz
+/usr/share/man/man5/cupsd-logs.5.gz
 /usr/share/man/man5/ipptoolfile.5.gz
 /usr/share/man/man5/mime.*.5.gz
 %dir /usr/share/man/man8
@@ -327,7 +328,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man8/cupsfilter.8.gz
 /usr/share/man/man8/cupsd.8.gz
 /usr/share/man/man8/cupsd-helper.8.gz
-/usr/share/man/man8/cupsd-logs.8.gz
 /usr/share/man/man8/cupsdisable.8.gz
 /usr/share/man/man8/cupsenable.8.gz
 /usr/share/man/man8/cupsreject.8.gz