rpms/foomatic/devel foomatic-badxml.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 foomatic.spec, 1.125, 1.126 sources, 1.36, 1.37

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	.cvsignore foomatic.spec sources 
Added Files:
	foomatic-badxml.patch 
Log Message:
* Mon Jan 16 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-31
- Fix tag mismatch in db.
- Updated db to 3.0-20060116.


foomatic-badxml.patch:
 HP-Color_LaserJet_3500.xml |    5 -----
 1 files changed, 5 deletions(-)

--- NEW FILE foomatic-badxml.patch ---
--- foomatic-db-20060116/db/source/printer/HP-Color_LaserJet_3500.xml.badxml	2006-01-16 13:36:35.000000000 +0000
+++ foomatic-db-20060116/db/source/printer/HP-Color_LaserJet_3500.xml	2006-01-16 13:36:45.000000000 +0000
@@ -23,11 +23,6 @@
     </text>
   </lang>
   <autodetect>
-    <usb>
-      <comandset>PJL,PML,DW-PCL,JR4.0</comandset>
-      <description>Hewlet-Packardz</manufacturer>
-      <model>hp color LaserJet 3500</model>
-    </usb>
   </autodetect>
   <functionality>B</functionality>
   <driver>hpijs</driver>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	3 Jan 2006 13:08:39 -0000	1.36
+++ .cvsignore	16 Jan 2006 14:12:52 -0000	1.37
@@ -26,3 +26,4 @@
 foomatic-db-hpijs-1.5-20051209.tar.gz
 foomatic-db-engine-3.0-20051209.tar.gz
 foomatic-db-3.0-20060103.tar.gz
+foomatic-db-3.0-20060116.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- foomatic.spec	10 Jan 2006 13:27:54 -0000	1.125
+++ foomatic.spec	16 Jan 2006 14:12:52 -0000	1.126
@@ -1,4 +1,4 @@
-%define dbver 20060103
+%define dbver 20060116
 %define enginever 3.0-20051209
 %define filtersver 20051209
 %define hpijsver 1.5-20051209
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release: 30
+Release: 31
 License:	GPL
 Group: System Environment/Libraries
 
@@ -51,6 +51,9 @@
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch15: foomatic-bad-utf8.patch
 
+# Fix tag mismatch in db.
+Patch16: foomatic-badxml.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -110,6 +113,7 @@
 
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
+%patch16 -p1 -b .badxml
 
 %if %with_omni
 # Omni printers
@@ -263,6 +267,10 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Mon Jan 16 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-31
+- Fix tag mismatch in db.
+- Updated db to 3.0-20060116.
+
 * Tue Jan 10 2006 Tim Waugh <twaugh at redhat.com>
 - Don't remove the cache directory, only its contents (bug #177266).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	3 Jan 2006 13:08:39 -0000	1.36
+++ sources	16 Jan 2006 14:12:52 -0000	1.37
@@ -3,4 +3,4 @@
 5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
 8c217af8a570124d9ad7f8a4b1270ebe  foomatic-db-hpijs-1.5-20051209.tar.gz
 c0375c9e1d78685639e39abe24ffbdff  foomatic-db-engine-3.0-20051209.tar.gz
-abe054a3f80b180b670d96f46f6ec556  foomatic-db-3.0-20060103.tar.gz
+54ae910edbb0ed3816cebe05a0f0b605  foomatic-db-3.0-20060116.tar.gz