rpms/foomatic/devel foomatic-db-engine-libdir.patch, 1.3, 1.4 foomatic-filters-libdir.patch, 1.3, 1.4 foomatic.spec, 1.132, 1.133

Fri Mar 24 18:01:45 UTC 2006

Author: twaugh

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

Modified Files:
	foomatic-db-engine-libdir.patch foomatic-filters-libdir.patch 
	foomatic.spec 
Log Message:
* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-34
- Always use /usr/lib/cups/{backend,filter}.


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/devel/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	24 Mar 2006 18:01:09 -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)
  

foomatic-filters-libdir.patch:
 configure.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: foomatic-filters-libdir.patch
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic-filters-libdir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foomatic-filters-libdir.patch	9 Dec 2005 15:16:34 -0000	1.3
+++ foomatic-filters-libdir.patch	24 Mar 2006 18:01:09 -0000	1.4
@@ -1,5 +1,5 @@
 --- foomatic-filters-3.0-20051209/configure.in.libdir	2005-08-16 03:19:30.000000000 +0100
-+++ foomatic-filters-3.0-20051209/configure.in	2005-12-09 14:43:17.000000000 +0000
++++ foomatic-filters-3.0-20051209/configure.in	2006-03-24 17:39:33.000000000 +0000
 @@ -13,7 +13,7 @@
  AC_PROG_MAKE_SET
  
@@ -9,20 +9,8 @@
  
  dnl Get the operating system and version number...
  uname=`uname`
-@@ -38,22 +38,22 @@
- AC_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH)
- 
- dnl Check for /usr/lib/cups
--AC_PATH_DIR(CUPS,cups,/usr/lib/cups,$LIBSEARCHPATH)
-+AC_PATH_DIR(CUPS,cups,$libdir/cups,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/cups/filter
--AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$LIBSEARCHPATH)
-+AC_PATH_DIR(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/cups/backend
--AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
-+AC_PATH_DIR(CUPS_BACKENDS,cups/backend,$libdir/cups/backend,$LIBSEARCHPATH)
+@@ -47,13 +47,13 @@
+ AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
  
  dnl Check for /usr/lib/ppr
 -AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- foomatic.spec	11 Feb 2006 02:45:20 -0000	1.132
+++ foomatic.spec	24 Mar 2006 18:01:09 -0000	1.133
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release: 33.2
+Release: 34
 License:	GPL
 Group: System Environment/Libraries
 
@@ -141,6 +141,9 @@
 popd
 
 %build
+export CUPS_BACKENDS=/usr/lib/cups/backend
+export CUPS_FILTERS=/usr/lib/cups/filter
+
 pushd foomatic-filters-3.0-%{filtersver}
 %configure
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
@@ -228,7 +231,7 @@
 find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs chmod 0644
 
 # Use relative, not absolute, symlink for CUPS filter.
-ln -sf ../../../bin/foomatic-rip %{buildroot}%{_libdir}/cups/filter/foomatic-rip
+ln -sf ../../../bin/foomatic-rip %{buildroot}/usr/lib/cups/filter/foomatic-rip
 
 mkdir $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Custom
 mkdir -p $RPM_BUILD_ROOT%{_var}/cache/foomatic
@@ -267,14 +270,17 @@
 %{_bindir}/*
 %{_sbindir}/*
 %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic
-%dir %{_libdir}/cups
-%{_libdir}/cups/*
+%dir /usr/lib/cups
+/usr/lib/cups/*
 %{_datadir}/foomatic
 %{_datadir}/cups/model/foomatic-db-ppds
 %{_mandir}/*/*
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-34
+- Always use /usr/lib/cups/{backend,filter}.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-33.2
 - bump again for double-long bug on ppc(64)
 


