From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 27 May 2014 15:02:42 +0000 (+0000)
Subject: Mirror fixes from trunk.
X-Git-Tag: release-2.1.4~16^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7915e0baf719c96a80aef6a51b6b056f83b37cd;p=thirdparty%2Fcups.git

Mirror fixes from trunk.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11897 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 4761771754..d5aab15896 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.3 - 2014-05-22
+CHANGES.txt - 1.7.3 - 2014-05-27
 --------------------------------
 
 CHANGES IN CUPS V1.7.3
@@ -27,6 +27,9 @@ CHANGES IN CUPS V1.7.3
 	- IPP queues using hardcoded credentials would ask for credentials
 	  (STR #4371)
 	- Dates in non-UTF-8 locales did not display correctly (STR #4388)
+	- The RPM spec file now looks for libusb-devel 1.0 or later.
+	- Fixed the "create-printer-subscription.test" file for IPPTOOL
+	  (STR #4420)
 
 
 CHANGES IN CUPS V1.7.2
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 0623ab4870..77643384c1 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -62,7 +62,7 @@ BuildRequires: avahi-devel
 %endif
 
 %if %{?_with_libusb1:1}%{!?_with_libusb1:0}
-BuildRequires: libusbx-devel
+BuildRequires: libusb-devel >= 1.0
 %endif
 
 # Use buildroot so as not to disturb the version already installed
diff --git a/test/create-printer-subscription.test b/test/create-printer-subscription.test
index 91c98f7618..2482af8841 100644
--- a/test/create-printer-subscription.test
+++ b/test/create-printer-subscription.test
@@ -1,16 +1,16 @@
 #
 # "$Id$"
 #
-#   Create a printer subscription.
+# Create a printer subscription.
 #
-#   Copyright 2007-2013 by Apple Inc.
-#   Copyright 2001-2006 by Easy Software Products. All rights reserved.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 2001-2006 by Easy Software Products. All rights reserved.
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 # Usage:
 #
@@ -31,8 +31,8 @@
 	ATTR language attributes-natural-language en
 	ATTR uri printer-uri $uri
 
-        GROUP subscription-attributes-tag
-	ATTR uri notify-recipient $recipient
+	GROUP subscription-attributes-tag
+	ATTR uri notify-recipient-uri $recipient
 	ATTR keyword notify-events printer-config-changed,printer-state-changed
 
 	# What statuses are OK?