rpms/foomatic/FC-5 .cvsignore, 1.38, 1.39 foomatic-db-engine-libdir.patch, 1.3, 1.4 foomatic.spec, 1.133, 1.134 sources, 1.38, 1.39 foomatic-cleanup.patch, 1.1, NONE foomatic-default0.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	.cvsignore foomatic-db-engine-libdir.patch foomatic.spec 
	sources 
Removed Files:
	foomatic-cleanup.patch foomatic-default0.patch 
Log Message:
* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
- Updated db-engine to 3.0-20060421.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-5/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	17 Jan 2006 13:50:45 -0000	1.38
+++ .cvsignore	21 Apr 2006 11:24:22 -0000	1.39
@@ -28,3 +28,4 @@
 foomatic-db-3.0-20060103.tar.gz
 foomatic-db-3.0-20060116.tar.gz
 foomatic-db-engine-3.0-20060117.tar.gz
+foomatic-db-engine-3.0-20060421.tar.gz

foomatic-db-engine-libdir.patch:
 configure.ac |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: foomatic-db-engine-libdir.patch
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-5/foomatic-db-engine-libdir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foomatic-db-engine-libdir.patch	17 Jan 2006 13:50:45 -0000	1.3
+++ foomatic-db-engine-libdir.patch	21 Apr 2006 11:24:22 -0000	1.4
@@ -11,17 +11,6 @@
  PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal
  MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev
  
-@@ -218,8 +218,8 @@
- AC_PATH_PROGS(CUPS_ADMIN,lpadmin,/usr/sbin/lpadmin,$SBINSEARCHPATH)
- AC_PATH_PROGS(CUPS_LPSTAT,lpstat,/usr/bin/lpstat,$BINSEARCHPATH)
- AC_PATH_DIRS(CUPS_PPDS,cups/model,/usr/share/cups/model,$DATASEARCHPATH)
--AC_PATH_DIRS(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$DATASEARCHPATH)
--AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$DATASEARCHPATH)
-+AC_PATH_DIRS(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$DATASEARCHPATH)
-+AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,$libdir/cups/backend,$DATASEARCHPATH)
- AC_PATH_PROGS(CUPS_PCONF,cups/printers.conf,$CUPS_ETC/printers.conf,$SYSCONFSEARCHPATH)
- AC_PATH_PROGS(CUPS_LPR,lpr-cups lpr,/usr/bin/lpr,$BINSEARCHPATH)
- AC_PATH_PROGS(CUPS_LPQ,lpq-cups lpq,/usr/bin/lpq,$BINSEARCHPATH)
 @@ -236,15 +236,15 @@
  AC_PATH_PROGS(CUPS_LPINFO,lpinfo,/usr/sbin/lpinfo,$SBINSEARCHPATH)
  


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-5/foomatic.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- foomatic.spec	24 Mar 2006 18:16:29 -0000	1.133
+++ foomatic.spec	21 Apr 2006 11:24:22 -0000	1.134
@@ -1,5 +1,5 @@
 %define dbver 20060116
-%define enginever 3.0-20060117
+%define enginever 3.0-20060421
 %define filtersver 20051209
 %define hpijsver 1.5-20051209
 
@@ -54,12 +54,6 @@
 # Fix tag mismatch in db.
 Patch16: foomatic-badxml.patch
 
-# Handle PPDs with default option values of '0'.
-Patch17: foomatic-default0.patch
-
-# Fix foomatic-cleanupdrivers.
-Patch18: foomatic-cleanup.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -111,8 +105,6 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
-%patch17 -p1 -b .default0
-%patch18 -p1 -b .cleanup
 ./make_configure
 popd
 
@@ -288,6 +280,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
+- Updated db-engine to 3.0-20060421.
+
 * Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-33.3
 - Use /usr/lib/cups/backend and /usr/lib/cups/filter.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-5/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	17 Jan 2006 13:50:45 -0000	1.38
+++ sources	21 Apr 2006 11:24:22 -0000	1.39
@@ -3,4 +3,4 @@
 5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
 8c217af8a570124d9ad7f8a4b1270ebe  foomatic-db-hpijs-1.5-20051209.tar.gz
 54ae910edbb0ed3816cebe05a0f0b605  foomatic-db-3.0-20060116.tar.gz
-d764bd043e47abc523ea9fbcd77659f1  foomatic-db-engine-3.0-20060117.tar.gz
+54e5a0daf74d9d0e851069f54f5b6995  foomatic-db-engine-3.0-20060421.tar.gz


--- foomatic-cleanup.patch DELETED ---


--- foomatic-default0.patch DELETED ---