From 5adf93e8a4af5e6dff1196818797a3648e1d72f9 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Jun 07 2011 14:54:49 +0000
Subject: cups-genppdupdate: fixed multicat support (bug #711021).


It was writing an extra newline character after the URI, which caused
the gutenprint.5.2 multicat process to exit.  This prevented some PPDs
from being updated.

---

diff --git a/cups-genppdupdate.py.in b/cups-genppdupdate.py.in
index e01a322..d0d6e92 100755
--- a/cups-genppdupdate.py.in
+++ b/cups-genppdupdate.py.in
@@ -2,7 +2,7 @@
 # $Id$
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
-# Copyright (C) 2009 Red Hat, Inc.
+# Copyright (C) 2009, 2011 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -767,7 +767,7 @@ def get_ppd_fh (ppd_source_filename, filename, driver, locale, region):
                                                                 "w"))
                         server_multicat_initialized = mc_proc
 
-                    print >>server_multicat_initialized.stdin, "%s\n" % url
+                    print >>server_multicat_initialized.stdin, "%s" % url
                     server_multicat_initialized.stdin.flush ()
                     return (new_ppd_filename,
                             server_multicat_initialized.stdout)
diff --git a/gutenprint.spec b/gutenprint.spec
index 30efb63..0c592bf 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:	http://dl.sf.net/gimp-print/gutenprint-5.2/%{version}/gutenprint-%{version}.tar.bz2
@@ -298,6 +298,12 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Jun  7 2011 Tim Waugh <twaugh@redhat.com> 5.2.7-2
+- cups-genppdupdate: fixed multicat support (bug #711021).  It was
+  writing an extra newline character after the URI, which caused the
+  gutenprint.5.2 multicat process to exit.  This prevented some
+  PPDs from being updated.
+
 * Thu May 05 2011 Jiri Popelka <jpopelka@redhat.com> 5.2.7-1
 - 5.2.7.