rpms/foomatic/F-11 foomatic.spec,1.222,1.223 sources,1.75,1.76

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3514

Modified Files:
	foomatic.spec sources 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-7
- Restored db-hpijs.



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- foomatic.spec	21 Aug 2009 10:15:19 -0000	1.222
+++ foomatic.spec	24 Aug 2009 14:09:57 -0000	1.223
@@ -2,11 +2,12 @@
 %define dbver_snap 20090819
 %define enginever 4.0.2
 %define filtersver 4.0.2
+%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -18,6 +19,7 @@ Source0: http://www.openprinting.org/dow
 
 Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
+Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 ## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
 
@@ -82,7 +84,7 @@ queues (foomatic-configure) and to print
 The site http://www.linuxprinting.org/ is based on this database.
 
 %prep
-%setup -q -c -a 1 -a 2
+%setup -q -c -a 1 -a 2 -a 3
 
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
@@ -95,6 +97,9 @@ chmod a+x mkinstalldirs
 %patch102 -p1
 popd
 
+pushd foomatic-db-hpijs-%{hpijsver}
+popd
+
 pushd foomatic-db-%{dbver_snap}
 cd db/source
 
@@ -142,6 +147,11 @@ pushd foomatic-db-%{dbver_snap}
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
 
+pushd foomatic-db-hpijs-%{hpijsver}
+%configure
+make PREFIX=%{_prefix} CFLAGS="$RPM_OPTFLAGS"
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -171,6 +181,13 @@ make	DESTDIR=%buildroot PREFIX=%{_prefix
 
 popd
 
+pushd foomatic-db-hpijs-%{hpijsver}
+make	DESTDIR=%buildroot PREFIX=%{_prefix} \
+	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
+	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
+	install
+popd
+
 # Remove ghostscript UPP drivers that are gone in 7.07
 rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
 
@@ -228,6 +245,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-7
+- Restored db-hpijs.
+
 * Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-6
 - Updated to foomatic-db-4.0-20090819.  Removed db-hpijs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	21 Aug 2009 10:15:19 -0000	1.75
+++ sources	24 Aug 2009 14:09:57 -0000	1.76
@@ -1,3 +1,4 @@
 9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
 8595d59be013482e4dd2834adf11f55a  foomatic-db-engine-4.0.2.tar.gz
+2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
 b48520c72a3690b35bb93585fd2e632a  foomatic-db-4.0-20090819.tar.gz