[cups/f15] Fixed textonly filter to work with single copies (bug #738412).

Tim Waugh twaugh at fedoraproject.org
Wed Dec 21 11:50:10 UTC 2011


commit 7870e7ad16228927d435b9b0421083a6dcf203ee
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Dec 21 11:27:55 2011 +0000

    Fixed textonly filter to work with single copies (bug #738412).

 cups.spec       |    5 ++++-
 textonly.filter |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/cups.spec b/cups.spec
index 27765df..e28dd5c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -13,7 +13,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -639,6 +639,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Dec 21 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-7
+- Fixed textonly filter to work with single copies (bug #738412).
+
 * Fri Dec  9 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-6
 - Detangle cups-serverbin-compat.patch from cups-lspp.patch.
 
diff --git a/textonly.filter b/textonly.filter
index 504bc4d..1553550 100755
--- a/textonly.filter
+++ b/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)


More information about the scm-commits mailing list