[splix/f17] Add Device ID for Samsung ML-2010.

[Jiří Popelka]

commit ecdb637484cfba6395b55fc7a95c757c3d7bebd9
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Apr 19 14:05:09 2012 +0200

    Add Device ID for Samsung ML-2010.

 splix-deviceID.patch |   16 ++++++++++++----
 splix.spec           |   10 +++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/splix-deviceID.patch b/splix-deviceID.patch
index 9d76499..3da2473 100644
--- a/splix-deviceID.patch
+++ b/splix-deviceID.patch
@@ -1,6 +1,6 @@
-diff -up splix/ppd/samsung.drv.deviceID splix/ppd/samsung.drv
---- splix/ppd/samsung.drv.deviceID	2011-07-20 18:20:18.000000000 +0200
-+++ splix/ppd/samsung.drv	2012-01-18 18:41:04.460975855 +0100
+diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
+--- splix/ppd/samsung.drv.in.deviceID	2011-12-06 22:55:59.000000000 +0100
++++ splix/ppd/samsung.drv.in	2012-04-19 14:02:30.002620677 +0200
 @@ -83,6 +83,7 @@ Manufacturer "Samsung"
                      PCFileName "ml1520.ppd"
                  } {
@@ -9,7 +9,15 @@ diff -up splix/ppd/samsung.drv.deviceID splix/ppd/samsung.drv
                      PCFileName "ml1610.ppd"
                  } {
                      ModelName "ML-1710"
-@@ -193,6 +194,7 @@ Manufacturer "Samsung"
+@@ -166,6 +167,7 @@ Manufacturer "Samsung"
+                     PCFileName "ml1640.ppd"
+                 } {
+                     ModelName "ML-2010"
++                    Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2010;CMD:GDI;"
+                     PCFileName "ml2010.ppd"
+                 } {
+                     ModelName "ML-2015"
+@@ -193,6 +195,7 @@ Manufacturer "Samsung"
      
                  {
                      ModelName "ML-1660"
diff --git a/splix.spec b/splix.spec
index 9c8fcc3..59aa4ee 100644
--- a/splix.spec
+++ b/splix.spec
@@ -13,8 +13,7 @@ URL: http://splix.sourceforge.net/
 # and renamed to follow naming guidelines
 Source0: splix-%{version}.%{checkout}.tar.gz
 
-# Add Device ID for
-# Samsung ML-1610
+# IEEE 1284 Device IDs
 Patch0:  splix-deviceID.patch
 
 Requires: cups
@@ -37,8 +36,6 @@ Splix doesn't support old SPL(1) printers.
 %prep
 %setup -q -n splix
 
-%patch0 -p1 -b .deviceID
-
 pushd ppd
 # rename *.drv to *.drv.in
 for i in *.drv; do mv $i ${i}.in; done
@@ -46,6 +43,8 @@ for i in *.drv; do mv $i ${i}.in; done
 make distclean
 popd
 
+%patch0 -p1 -b .deviceID
+
 %build
 pushd ppd
 make drv
@@ -72,9 +71,10 @@ make install
 * Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.9.20120419svn
 - Latest upstream snapshot: all patches and changes merged upstream !
 - Build splix with JBIG1 support and install DRV files instead of PPD files.
+- Add Device ID for Samsung ML-2010 (#807308).
 
 * Wed Jan 18 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.8.20111121svn
-- Add Device ID for Samsung ML-1660.
+- Add Device ID for Samsung ML-1660 (Ubuntu #917507).
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-0.7.20111121svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild