Merge branch 'f13' into f14

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)

gutenprint-build.patch

@@ -0,0 +1,22 @@
+diff -up gutenprint-5.2.7/src/cups/commandtocanon.c.build gutenprint-5.2.7/src/cups/commandtocanon.c
+--- gutenprint-5.2.7/src/cups/commandtocanon.c.build	2011-06-07 13:32:37.372042304 +0100
++++ gutenprint-5.2.7/src/cups/commandtocanon.c	2011-06-07 13:32:41.270970750 +0100
+@@ -13,6 +13,7 @@
+ 
+ #include <cups/cups.h>
+ #include <ctype.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ 
+ 
+diff -up gutenprint-5.2.7/src/cups/commandtoepson.c.build gutenprint-5.2.7/src/cups/commandtoepson.c
+--- gutenprint-5.2.7/src/cups/commandtoepson.c.build	2007-12-24 17:19:20.000000000 +0000
++++ gutenprint-5.2.7/src/cups/commandtoepson.c	2011-06-07 13:32:35.656073794 +0100
+@@ -30,6 +30,7 @@
+ 
+ #include <cups/cups.h>
+ #include <ctype.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 

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
@@ -18,6 +18,7 @@ Patch2:         gutenprint-selinux.patch
 Patch3:         gutenprint-postscriptdriver.patch
 Patch4:         gutenprint-device-ids.patch
 Patch5:         gutenprint-null-pointer.patch
+Patch6:         gutenprint-build.patch
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 
@@ -169,6 +170,8 @@ Epson, HP and compatible printers.
 %patch4 -p1 -b .device-ids
 # Avoid null pointer access in escputil (bug #659120).
 %patch5 -p1 -b .null-pointer
+# Fix build against new versions of gcc.
+%patch6 -p1 -b .build
 
 cp %{SOURCE2} src/cups/cups-genppdupdate.in
 
@@ -298,6 +301,13 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Jun  7 2011 Tim Waugh <twaugh@redhat.com> 5.2.7-2
+- Fix build against newer versions of gcc.
+- 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.