[gutenprint/f20] Upstream patch to tweak Canon MP540 output (bug #1118446).

[Tim Waugh]

commit 7c4746f2413ebe30117817d55d16517ae94bf157
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Jul 31 09:59:53 2014 +0100

    Upstream patch to tweak Canon MP540 output (bug #1118446).
    
    Resolves: rhbz#1118446

 gutenprint-canon-mp540.patch |   16 ++++++++++++++++
 gutenprint.spec              |    9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/gutenprint-canon-mp540.patch b/gutenprint-canon-mp540.patch
new file mode 100644
index 0000000..a61f201
--- /dev/null
+++ b/gutenprint-canon-mp540.patch
@@ -0,0 +1,16 @@
+diff -up gutenprint-5.2.9/src/main/canon-printers.h.canon-mp540 gutenprint-5.2.9/src/main/canon-printers.h
+--- gutenprint-5.2.9/src/main/canon-printers.h.canon-mp540	2012-05-23 02:50:14.000000000 +0100
++++ gutenprint-5.2.9/src/main/canon-printers.h	2014-07-31 09:58:05.979314221 +0100
+@@ -1941,9 +1941,9 @@ static const canon_cap_t canon_model_cap
+     &canon_MULTIPASS_MP540_modelist,
+     &canon_MULTIPASS_MX330_paperlist,
+     &canon_MULTIPASS_MP540_modeuselist,
+-    NULL,
+-    NULL,
+-    NULL,
++    iP4200_lum_adjustment,
++    iP4200_hue_adjustment,
++    iP4200_sat_adjustment,
+     iP4500_channel_order
+   },
+   { /* Canon PIXMA MP550 ---with XML */
diff --git a/gutenprint.spec b/gutenprint.spec
index 9c92faf..d3b99c4 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -3,7 +3,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.2.9
-Release:        15%{?dist}
+Release:        16%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
@@ -20,6 +20,7 @@ Patch5:         gutenprint-ui2-libdeps.patch
 Patch6:         gutenprint-yyin.patch
 Patch7:         gutenprint-manpage.patch
 Patch8:         gutenprint-test-suite.patch
+Patch9:         gutenprint-canon-mp540.patch
 License:        GPLv2+
 
 BuildRequires:  cups-libs, cups-devel, cups
@@ -195,6 +196,9 @@ Epson, HP and compatible printers.
 # Fix the test suite.
 %patch8 -p1 -b .test-suite
 
+# Upstream patch to tweak Canon MP540 output (bug #1118446).
+%patch9 -p1 -b .canon-mp540
+
 cp %{SOURCE2} src/cups/cups-genppdupdate.in
 
 %build
@@ -324,6 +328,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Jul 31 2014 Tim Waugh <twaugh at redhat.com> - 5.2.9-16
+- Upstream patch to tweak Canon MP540 output (bug #1118446).
+
 * Thu Jan  2 2014 Tim Waugh <twaugh at redhat.com> - 5.2.9-15
 - Fixed typo in cups-genppdupdate script (bug #1046073).