From f9204a46ae6cc84b824770e1f6768a30066db0d8 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Sep 04 2008 10:03:28 +0000
Subject: - Removed ampathxml and xml-cflags patches.


---

diff --git a/foomatic-ampathxml.patch b/foomatic-ampathxml.patch
deleted file mode 100644
index 6f51984..0000000
--- a/foomatic-ampathxml.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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-db-engine-xml-cflags.patch b/foomatic-db-engine-xml-cflags.patch
deleted file mode 100644
index 633bf01..0000000
--- a/foomatic-db-engine-xml-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- foomatic-db-engine-3.0.2/Makefile.in.xml2	2004-09-24 09:00:41.126334697 +0100
-+++ foomatic-db-engine-3.0.2/Makefile.in	2004-09-24 09:09:37.677826957 +0100
-@@ -53,7 +53,7 @@
- ## C settings
- CC=@CC@
- CFLAGS=@CFLAGS@
--XML_CFLAGS=@XML_CPPFLAGS@
-+XML_CFLAGS=@XML_CFLAGS@
- XML_LIBS=@XML_LIBS@
- 
- ## Settings for Perl
diff --git a/foomatic.spec b/foomatic.spec
index 9a08ff7..b1a2174 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -27,12 +27,6 @@ Patch2: foomatic-db-engine-libdir.patch
 # Set GS_FONTPATH in gs wrapper (bug #81410).
 Patch5: foomatic-2.0.2-fontpath.patch
 
-# Fix 3.0.2 build.
-Patch10: foomatic-db-engine-xml-cflags.patch
-
-# Make foomatic-db-engine build.
-Patch14: foomatic-ampathxml.patch
-
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch15: foomatic-bad-utf8.patch
 
@@ -88,8 +82,6 @@ popd
 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
-%patch14 -p1 -b .ampathxml
-%patch10 -p1 -b .xml-cflags
 %patch15 -p1
 ./make_configure
 popd
@@ -241,6 +233,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 
 %changelog
 * Thu Sep  4 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-65
+- Removed ampathxml and xml-cflags patches.
 - Updated db-hpijs to 20080904.
 - Updated db to 20080904.
 - Updated filters to 3.0-20080904.