Merge branch 'f15' into f16

cups.spec

@@ -13,7 +13,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.5.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -660,6 +660,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Wed Dec 21 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-24
+- Fixed textonly filter to work with single copies (bug #738412).
+
 * Fri Dec  9 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-23
 - Detangle cups-serverbin-compat.patch from cups-lspp.patch.
 - Bind to datagram socket as well in systemd cups.socket unit file, to

textonly.filter

@@ -31,7 +31,7 @@ if [ $# -ge 4 ]; then
   COPIES="$4"
 fi
 
-if [ "$COPIES" -gt 1 ] && [ $# -lt 6 ]; then
+if [ $# -lt 6 ]; then
   unset TMPFILE
   trap -- 'rm -f "$TMPFILE"' EXIT
   TMPFILE=$(mktemp ${TMPDIR:-/tmp}/textonly.XXXXXX)