From e608ff11ef82be5b7b5c9f7e1209fa354cbaf953 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 11 Jan 2007 18:15:42 +0000
Subject: [PATCH] - The cups subpackage no longer requires gimp-print-cups. -
 Ship escputil, native CUPS backend/filters, and cups-calibrate.

---
 gutenprint.spec | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/gutenprint.spec b/gutenprint.spec
index 6cc907a..51de7f7 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.0.0
-Release:        0.17%{?dist}
+Release:        1%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -202,7 +202,6 @@ that is used by gutenprint-devel package.
 Summary:        CUPS drivers for Canon, Epson, HP and compatible printers
 Group:          Applications/Publishing
 Requires:       cups >= 1.2.1-1.7
-Requires:       gimp-print-cups
 
 %description cups
 This package contains native CUPS support for a wide range of Canon,
@@ -224,14 +223,6 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 rm -rf %{buildroot}%{_datadir}/gutenprint/doc
-rm -rf %{buildroot}%{_bindir}/escputil
-rm -rf %{buildroot}%{_mandir}/man1/escputil.1*
-#rm -rf %{buildroot}%{_libdir}/gimp/2.0/plug-ins/print
-rm -rf %{buildroot}%{cups_serverbin}/backend/*
-rm -rf %{buildroot}%{cups_serverbin}/filter/commandtocanon
-rm -rf %{buildroot}%{cups_serverbin}/filter/commandtoepson
-rm -rf %{buildroot}%{_bindir}/cups-calibrate
-rm -rf %{buildroot}%{_mandir}/man8/cups-calibrate.8*
 rm -rf %{buildroot}%{_libdir}/gutenprint/5.0.0/modules/*.la
 
 %find_lang gutenprint
@@ -262,10 +253,8 @@ exit 0
 %files -f gutenprint.lang
 %defattr(-, root, root,-)
 %doc COPYING AUTHORS NEWS README doc/FAQ.html doc/gutenprint-users-manual.odt doc/gutenprint-users-manual.pdf
-########### MARKED FOR INCLUSION IN FC7 #################
-#%{_bindir}/escputil
-#%{_mandir}/man1/escputil.1*
-########################################################
+%{_bindir}/escputil
+%{_mandir}/man1/escputil.1*
 %{_bindir}/ijsgutenprint.5.0
 %if %{build_with_ijs_support}
 %{_mandir}/man1/ijsgutenprint.1*
@@ -308,13 +297,13 @@ exit 0
 %defattr(-, root, root,-)
 %config(noreplace) %{_sysconfdir}/cups/command.types
 %{_datadir}/cups/calibrate.ppm
-#%{cups_serverbin}cups/backend/*
-#%{cups_serverbin}/cups/filter/*
-#%{_bindir}/cups-calibrate
+%{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*
+%{_mandir}/man8/cups-calibrate.8*
 %{_mandir}/man8/cups-genppd*.8*
 
 %files ppds-cs
@@ -382,6 +371,10 @@ exit 0
 %{_datadir}/cups/model/gutenprint/5.0/zh_TW
 
 %changelog
+* Thu Jan 11 2007 Tim Waugh <twaugh@redhat.com> 5.0.0-1
+- The cups subpackage no longer requires gimp-print-cups.
+- Ship escputil, native CUPS backend/filters, and cups-calibrate.
+
 * Thu Jan 11 2007 Parag Nemade <panemade@gmail.com>- 5.0.0-0.17
 - Enabling -plugin subpackage as gimp-print dropped its -plugin subpackage.