From f7e28db2c641727fbe1fa9223cf79f8d985b9517 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 2 Mar 2007 17:28:39 +0000
Subject: [PATCH] - Fixed menu patch. - Don't list rastertogutenprint twice.

---
 gutenprint-menu.patch | 17 ++++++-----------
 gutenprint.spec       |  7 +++++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/gutenprint-menu.patch b/gutenprint-menu.patch
index 92255f4..2c76a41 100644
--- a/gutenprint-menu.patch
+++ b/gutenprint-menu.patch
@@ -1,16 +1,11 @@
---- gutenprint-5.0.0/src/gimp/print.c.menu	2007-02-28 17:16:49.000000000 +0000
-+++ gutenprint-5.0.0/src/gimp/print.c	2007-02-28 17:17:31.000000000 +0000
-@@ -130,11 +130,12 @@
+--- gutenprint-5.0.0/src/gimp2/print-print.c.menu	2007-03-02 17:08:51.000000000 +0000
++++ gutenprint-5.0.0/src/gimp2/print-print.c	2007-03-02 17:09:10.000000000 +0000
+@@ -43,7 +43,7 @@
  			  (BAD_CONST_CHAR) copy,
  			  (BAD_CONST_CHAR) VERSION " - " RELEASE_DATE,
- 			  /* Do not translate the "<Image>" */
+ 			  /* Do not translate the prefix "<Image>" */
 -			  (BAD_CONST_CHAR) N_("<Image>/File/Print..."),
-+			  (BAD_CONST_CHAR) N_("_Print..."),
++			  (BAD_CONST_CHAR) N_("<Image>/File/Send/Print..."),
  			  (BAD_CONST_CHAR) types,
  			  GIMP_PLUGIN,
- 			  nargs, 0,
- 			  args, NULL);
-+  gimp_plugin_menu_register ("file_print_gimp", "<Image>/File/Send");
- }
- 
- static guchar *gimp_thumbnail_data = NULL;
+ 			  n_args, 0,
diff --git a/gutenprint.spec b/gutenprint.spec
index 1473919..d98235a 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -325,7 +325,6 @@ exit 0
 %{cups_serverbin}/backend/*
 %{cups_serverbin}/filter/*
 %{_bindir}/cups-calibrate
-%{cups_serverbin}/filter/rastertogutenprint.5.0
 %{_sbindir}/cups-genppd*
 %{_datadir}/cups/model/gutenprint/5.0/C
 %{_mandir}/man8/cups-calibrate.8*
@@ -402,6 +401,10 @@ exit 0
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Fri Mar  2 2007 Tim Waugh <twaugh@redhat.com> 5.0.0-7
+- Fixed menu patch.
+- Don't list rastertogutenprint twice.
+
 * Wed Feb 28 2007 Tim Waugh <twaugh@redhat.com>
 - Fixed typo in patch line.