From 25dffd4163818837f710afa7715477b28eb419ca Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 04:57:19 +0000
Subject: auto-import changelog data from foomatic-3.0.1-10.src.rpm

Fri Aug 13 2004 Tim Waugh <twaugh@redhat.com> 3.0.1-10
- Add autodetect information for HP LJ 2200 (bug #129732).
Thu Aug 05 2004 Tim Waugh <twaugh@redhat.com>
- Add autodetect information for HP DJ 1220.

---

diff --git a/foomatic-ampathxml.patch b/foomatic-ampathxml.patch
new file mode 100644
index 0000000..6f51984
--- /dev/null
+++ b/foomatic-ampathxml.patch
@@ -0,0 +1,18 @@
+--- foomatic-db-engine-3.0.1/acinclude.m4.ampathxml	2002-10-11 02:16:34.000000000 +0100
++++ foomatic-db-engine-3.0.1/acinclude.m4	2004-08-13 18:28:13.166722758 +0100
+@@ -1,3 +1,4 @@
++AC_DEFUN([AM_PATH_XML],[exit 1])
+ dnl AC_PATH_DIR(VARIABLE, DIR-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
+ AC_DEFUN(AC_PATH_DIR,
+ [# Extract the first word of "$2", so it can be a program name with args.
+--- foomatic-db-engine-3.0.1/Makefile.in.ampathxml	2004-08-13 21:18:44.303809139 +0100
++++ foomatic-db-engine-3.0.1/Makefile.in	2004-08-13 21:19:12.302452644 +0100
+@@ -53,7 +53,7 @@
+ ## C settings
+ CC=@CC@
+ CFLAGS=@CFLAGS@
+-XML_CFLAGS=@XML_CFLAGS@
++XML_CFLAGS=@XML_CPPFLAGS@
+ XML_LIBS=@XML_LIBS@
+ 
+ ## Settings for Perl
diff --git a/foomatic.spec b/foomatic.spec
index 14da35e..cf0a350 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.1
-Release: 9
+Release: 10
 License:	GPL
 Group: System Environment/Libraries
 
@@ -52,6 +52,12 @@ Patch11: foomatic-3.0.1-lvalue.patch
 # Add autodetect information for HP DJ 6122 (bug #124629).
 Patch12: foomatic-hpdj6122.patch
 
+# Add autodetect information for HP DJ 1220.
+Patch13: foomatic-ieee1284.patch
+
+# Make foomatic-db-engine build.
+Patch14: foomatic-ampathxml.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -106,6 +112,7 @@ chmod a+x mkinstalldirs
 %patch6 -p1 -b .ppdload
 %patch10 -p1 -b .db-pm-omni-0.9.1
 %patch11 -p1 -b .lvalue
+%patch14 -p1 -b .ampathxml
 ./make_configure
 popd
 
@@ -116,6 +123,7 @@ pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 %patch8 -p1 -b .hplj5
 %patch12 -p1 -b .hpdj6122
+%patch13 -p1 -b .ieee1284
 
 # Omni printers
 tar xjf %{SOURCE4}
@@ -256,6 +264,12 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_mandir}/*/*
 
 %changelog
+* Fri Aug 13 2004 Tim Waugh <twaugh@redhat.com> 3.0.1-10
+- Add autodetect information for HP LJ 2200 (bug #129732).
+
+* Thu Aug  5 2004 Tim Waugh <twaugh@redhat.com>
+- Add autodetect information for HP DJ 1220.
+
 * Tue Jul 27 2004 Tim Waugh <twaugh@redhat.com> 3.0.1-9
 - Rebuilt.