rpms/foomatic/devel foomatic.spec,1.152,1.153 sources,1.46,1.47

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	foomatic.spec sources 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
- Removed now-unused with_omni code.



Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- foomatic.spec	30 Mar 2007 11:37:57 -0000	1.152
+++ foomatic.spec	16 Apr 2007 16:58:50 -0000	1.153
@@ -3,8 +3,6 @@
 %define filtersver 20051209
 %define hpijsver 20061031
 
-%define with_omni 0
-
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
@@ -22,9 +20,6 @@
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz
 Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
-# Build Omni first to get this (you'll have to create the tarball by hand):
-Source4: Omni-printers-0.9.2.tar.bz2
-
 # Use libdir.
 Patch1: foomatic-filters-libdir.patch
 Patch2: foomatic-db-engine-libdir.patch
@@ -107,11 +102,6 @@
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 
-%if %with_omni
-# Omni printers
-tar xjf %{SOURCE4}
-%endif
-
 # For gutenprint printers, use gutenprint-ijs-simplified.5.0.
 perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml
 
@@ -177,19 +167,6 @@
 	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
 	install
 
-%if %with_omni
-# Install printers from the Omni project, if there isn't already an entry
-cd Omni-printers
-P_DIR=$RPM_BUILD_ROOT/usr/share/foomatic/db/source/printer
-perl -pi -e 's/driver>omni-xml/driver>omni-compiled/' *.xml
-for P in *.xml; do
-       if [ ! -f $P_DIR/$P ]; then
-               cp $P $P_DIR;
-       fi;
-done;
-cd ..
-%endif
-
 popd
 
 pushd foomatic-db-hpijs-%{hpijsver}
@@ -264,6 +241,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+- Removed now-unused with_omni code.
+
 * Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-46
 - Don't ship old gimp-print data (bug #234388).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	30 Mar 2007 11:37:57 -0000	1.46
+++ sources	16 Apr 2007 16:58:50 -0000	1.47
@@ -1,4 +1,3 @@
-dcfbfbe16d76d0b6e44cb261fccd138f  Omni-printers-0.9.2.tar.bz2
 5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
 480ab4a4148667dad1ffc188b6480bce  foomatic-db-hpijs-20061031.tar.gz
 562703c7da605a4c89ac476a3bf7955b  foomatic-db-engine-3.0-20061109.tar.gz