rpms/foomatic/devel foomatic-ieee1284.patch, 1.37, 1.38 foomatic.spec, 1.102, 1.103

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18384

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-ieee1284.patch 
Log Message:
* Mon Jul 25 2005 Tim Waugh <twaugh at redhat.com>
- Fix IEEE 1284 ID for HP Photosmart 7260 (bug #162915).


foomatic-ieee1284.patch:
 HP-PhotoSmart_7260.xml |    6 ++++++
 1 files changed, 6 insertions(+)

Index: foomatic-ieee1284.patch
===================================================================
RCS file: foomatic-ieee1284.patch
diff -N foomatic-ieee1284.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ foomatic-ieee1284.patch	25 Jul 2005 12:14:37 -0000	1.38
@@ -0,0 +1,15 @@
+--- foomatic-db-20050718/db/source/printer/HP-PhotoSmart_7260.xml.ieee1284	2005-07-25 13:10:05.000000000 +0100
++++ foomatic-db-20050718/db/source/printer/HP-PhotoSmart_7260.xml	2005-07-25 13:10:25.000000000 +0100
+@@ -31,6 +31,12 @@
+       <description>hp photosmart 7260</description>
+       <commandset>MLC,PCL,PML,DW-PCL,DYN,DESKJET</commandset>
+     </general>
++    <usb>
++      <manufacturer>hp</manufacturer>
++      <model>photosmart 7200 series</model>
++      <description>7260</description>
++      <commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset>
++    </usb>
+   </autodetect>
+   <functionality>A</functionality>
+   <driver>hpijs</driver>


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- foomatic.spec	18 Jul 2005 14:29:54 -0000	1.102
+++ foomatic.spec	25 Jul 2005 12:14:37 -0000	1.103
@@ -32,6 +32,9 @@
 Patch1: foomatic-filters-libdir.patch
 Patch2: foomatic-db-engine-libdir.patch
 
+# Fix IEEE 1284 ID for HP Photosmart 7260 (bug #162915).
+Patch3: foomatic-ieee1284.patch
+
 # Set GS_FONTPATH in gs wrapper (bug #81410).
 Patch5: foomatic-2.0.2-fontpath.patch
 
@@ -124,6 +127,7 @@
 popd
 
 pushd foomatic-db-%{dbver}
+%patch3 -p1 -b .ieee1284
 %patch7 -p1 -b .ppdload-ppd
 %patch8 -p1 -b .hplj5
 
@@ -276,6 +280,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Jul 25 2005 Tim Waugh <twaugh at redhat.com>
+- Fix IEEE 1284 ID for HP Photosmart 7260 (bug #162915).
+
 * Mon Jul 18 2005 Tim Waugh <twaugh at redhat.com> 3.0.2-22
 - Updated db to 20050718.