From 15c6bc8774d3635303d249c6275e68602a6cfa1f Mon Sep 17 00:00:00 2001
From: Jaromír Končický <jkoncick@redhat.com>
Date: Feb 19 2014 17:44:35 +0000
Subject: 5.2.10-pre1.


---

diff --git a/.gitignore b/.gitignore
index 01670a0..22c0ca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ gutenprint-5.2.6.tar.bz2
 /gutenprint-5.2.7.tar.bz2
 /gutenprint-5.2.8.tar.bz2
 /gutenprint-5.2.9.tar.bz2
+/gutenprint-5.2.10-pre1.tar.bz2
diff --git a/gutenprint.spec b/gutenprint.spec
index 9c92faf..f90ace7 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -1,12 +1,14 @@
 %global build_with_ijs_support 1
+%global prever pre1
+%global VERSION %{version}-%{prever}
 
 Name:           gutenprint
 Summary:        Printer Drivers Package
-Version:        5.2.9
-Release:        15%{?dist}
+Version:        5.2.10
+Release:        0.1.%{prever}%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/gimp-print/%{name}-%{version}-%{prever}.tar.bz2
 # Post-install script to update foomatic PPDs.
 Source1:        gutenprint-foomaticppdupdate
 # Post-install script to update CUPS native PPDs.
@@ -15,11 +17,9 @@ Patch0:         gutenprint-menu.patch
 Patch1:         gutenprint-O6.patch
 Patch2:         gutenprint-selinux.patch
 Patch3:         gutenprint-postscriptdriver.patch
-Patch4:         gutenprint-device-ids.patch
-Patch5:         gutenprint-ui2-libdeps.patch
-Patch6:         gutenprint-yyin.patch
-Patch7:         gutenprint-manpage.patch
-Patch8:         gutenprint-test-suite.patch
+Patch4:         gutenprint-yyin.patch
+Patch5:         gutenprint-manpage.patch
+Patch6:         gutenprint-test-suite.patch
 License:        GPLv2+
 
 BuildRequires:  cups-libs, cups-devel, cups
@@ -149,7 +149,7 @@ This package contains native CUPS support for a wide range of Canon,
 Epson, HP and compatible printers.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{VERSION}
 # Fix menu placement of GIMP plugin.
 %patch0 -p1 -b .menu
 # Don't use -O6 compiler option.
@@ -158,42 +158,16 @@ Epson, HP and compatible printers.
 %patch2 -p1 -b .selinux
 # Allow the CUPS dynamic driver to run inside a build root.
 %patch3 -p1 -b .postscriptdriver
-# Added IEEE 1284 Device ID for
-#  Epson Stylus D78 (bug #245948).
-#  Epson Stylus Photo R230 (from Ubuntu #520466).
-#  Epson Stylus D92 (bug #570888).
-#  Epson Stylus Photo 1400 (bug #577299).
-#  Epson Stylus Photo 830U (bug #577307).
-#  HP DeskJet 959C (bug #577291).
-#  Canon PIXMA iP1900 (bug #741329).
-#  Canon PIXMA iP3000 (bug #652179).
-#  Canon PIXMA iP4000 (bug #741006).
-#  Canon PIXMA iP4200 (bug #626365).
-#  Epson Stylus C92 (bug #735400).
-#  Epson Stylus Color 680 (bug #652228).
-#  Epson Stylus Photo 1270 (bug #638537).
-#  Epson Stylus Photo R2400 (bug #720270).
-#  HP LaserJet 4050/4100/4350/5100/8000/M3027 MFP/M3035 MFP/P3005 (bug #659043).
-#  HP Color LaserJet 2500/4550 (bug #659044).
-#  Brother hl-2035 (bug #651603#c3)
-#  Canon PIXMA MP250 (bug #744087).
-#  Canon PIXMA MP500 (bug #911727).
-#  Canon PIXMA Pro9000mk2.
-#  Kyocera FS-1118MFP (bug #782379).
-%patch4 -p1 -b .device-ids
 # Fix build against new versions of gcc.
 
-# 5.2.9 has had wrong libgutenprintui2 dependencies
-%patch5 -p1 -b .ui2_libdeps
-
 # Don't export yy* symbols (bug #882194).
-%patch6 -p1 -b .yyin
+%patch4 -p1 -b .yyin
 
 # Added some escputil options to the manpage (bug #979064).
-%patch7 -p1 -b .manpage
+%patch5 -p1 -b .manpage
 
 # Fix the test suite.
-%patch8 -p1 -b .test-suite
+%patch6 -p1 -b .test-suite
 
 cp %{SOURCE2} src/cups/cups-genppdupdate.in
 
@@ -307,8 +281,10 @@ exit 0
 %files cups
 %doc
 %{_datadir}/cups/calibrate.ppm
+%{_datadir}/cups/usb/net.sf.gimp-print.usb-quirks
 %{_cups_serverbin}/filter/*
 %{_cups_serverbin}/driver/*
+%{_cups_serverbin}/backend/*
 %{_bindir}/cups-calibrate
 %{_sbindir}/cups-genppd*
 %{_mandir}/man8/cups-calibrate.8*
@@ -324,6 +300,10 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Mon Feb 17 2014 Jaromír Končický <jkoncick@redhat.com> - 5.2.10-0.1.pre1
+- 5.2.10-pre1.
+- Removed: device-ids.patch ui2-libdeps.patch
+
 * Thu Jan  2 2014 Tim Waugh <twaugh@redhat.com> - 5.2.9-15
 - Fixed typo in cups-genppdupdate script (bug #1046073).
 
diff --git a/sources b/sources
index 0ffeb67..bf5d7e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aefbec27b96dd404d9ac9811e17d58ce  gutenprint-5.2.9.tar.bz2
+b64f19296d358d28104a91a408def418  gutenprint-5.2.10-pre1.tar.bz2