diff --git a/gutenprint-device-ids.patch b/gutenprint-device-ids.patch
index 4563bcb..31d63fc 100644
--- a/gutenprint-device-ids.patch
+++ b/gutenprint-device-ids.patch
@@ -1,21 +1,37 @@
diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/xml/printers.xml
--- gutenprint-5.2.7/src/xml/printers.xml.device-ids 2011-05-01 17:44:04.000000000 +0200
-+++ gutenprint-5.2.7/src/xml/printers.xml 2011-06-03 17:12:34.507467491 +0200
-@@ -143,11 +143,11 @@
++++ gutenprint-5.2.7/src/xml/printers.xml 2011-09-27 18:28:25.950428556 +0200
+@@ -137,17 +137,17 @@
+
+
+
+-
++
+
+
-
+
-
+-
++
-
+
-@@ -331,7 +331,7 @@
+@@ -313,6 +313,7 @@
+
+
+
++
+
+
+
+@@ -331,7 +332,7 @@
@@ -24,7 +40,7 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
-@@ -389,7 +389,7 @@
+@@ -389,7 +390,7 @@
@@ -33,7 +49,16 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
-@@ -522,6 +522,7 @@
+@@ -422,7 +423,7 @@
+
+
+
+-
++
+
+
+
+@@ -522,6 +523,7 @@
@@ -41,7 +66,7 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
-@@ -785,7 +786,7 @@
+@@ -785,7 +787,7 @@
@@ -50,7 +75,7 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
-@@ -918,9 +919,9 @@
+@@ -918,9 +920,9 @@
@@ -62,7 +87,7 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
-@@ -1090,19 +1091,19 @@
+@@ -1090,19 +1092,19 @@
@@ -87,7 +112,7 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
-@@ -1110,15 +1111,15 @@
+@@ -1110,15 +1112,15 @@
diff --git a/gutenprint.spec b/gutenprint.spec
index 8afbe2d..39b932f 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -1,10 +1,9 @@
-%define build_with_ijs_support 1
-%define cups_serverbin %{_exec_prefix}/lib/cups
+%global build_with_ijs_support 1
Name: gutenprint
Summary: Printer Drivers Package
Version: 5.2.7
-Release: 5%{?dist}
+Release: 6%{?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
@@ -160,10 +159,14 @@ Epson, HP and compatible printers.
# Epson Stylus Photo 1400 (bug #577299).
# Epson Stylus Photo 830U (bug #577307).
# HP DeskJet 959C (bug #577291).
-# Canon PIXMA iP4200 (bug #626365).
+# 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)
@@ -211,8 +214,8 @@ for file in \
%{buildroot}%{_sbindir}/cups-genppd.5.2 \
%{buildroot}%{_libdir}/gimp/*/plug-ins/* \
%{buildroot}%{_libdir}/*.so.* \
- %{buildroot}%{cups_serverbin}/driver/* \
- %{buildroot}%{cups_serverbin}/filter/* \
+ %{buildroot}%{_cups_serverbin}/driver/* \
+ %{buildroot}%{_cups_serverbin}/filter/* \
%{buildroot}%{_bindir}/*
do
chrpath --delete ${file}
@@ -284,8 +287,8 @@ exit 0
%defattr(-, root, root,-)
%doc
%{_datadir}/cups/calibrate.ppm
-%{cups_serverbin}/filter/*
-%{cups_serverbin}/driver/*
+%{_cups_serverbin}/filter/*
+%{_cups_serverbin}/driver/*
%{_bindir}/cups-calibrate
%{_sbindir}/cups-genppd*
%{_mandir}/man8/cups-calibrate.8*
@@ -301,6 +304,14 @@ fi
/bin/rm -f /var/cache/foomatic/*
%changelog
+* Tue Sep 27 2011 Jiri Popelka 5.2.7-6
+- Use _cups_serverbin macro from cups-devel for where to put driver executables.
+- Added IEEE 1284 Device ID for:
+ Epson Stylus Photo R2400 (bug #720270)
+ Epson Stylus C92 (bug #735400)
+ Canon PIXMA iP1900 (bug #741329)
+ Canon PIXMA iP4000 (bug #741006)
+
* Tue Aug 09 2011 Jiri Popelka 5.2.7-5
- Improve the null-pointer.patch (bug #725447).
- Added IEEE 1284 Device ID for: