rpms/foomatic-db/devel foomatic-db.spec,1.5,1.6 sources,1.4,1.5

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31489

Modified Files:
	foomatic-db.spec sources 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> 4.0-8.20091126
- Added foomatic-db-hpijs tarball back in.



Index: foomatic-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/foomatic-db.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- foomatic-db.spec	26 Nov 2009 10:25:19 -0000	1.5
+++ foomatic-db.spec	4 Dec 2009 14:51:10 -0000	1.6
@@ -1,16 +1,18 @@
 %define dbver_rel 4.0
 %define dbver_snap 20091126
+%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 7.%{dbver_snap}%{?dist}
+Release: 8.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
 Requires: %{name}-ppds = %{version}-%{release}
 
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
+Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,10 +52,12 @@ Requires: %{name}-filesystem = %{version
 PPDs from printer manufacturers.
 
 %prep
-%setup -q -n %{name}-%{dbver_snap}
+%setup -q -c -a 1
 
 find -type d | xargs chmod g-s
 
+pushd foomatic-db-%{dbver_snap}
+
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@@ -80,16 +84,32 @@ done
 # Use sed instead of perl in the PPDs (bug #512739).
 find PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
 
+popd
+
 %build
+pushd foomatic-db-hpijs-%{hpijsver}
+%configure
+make PREFIX=%{_prefix}
+popd
+
+pushd foomatic-db-%{dbver_snap}
 %configure
 make PREFIX=%{_prefix}
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+pushd foomatic-db-%{dbver_snap}
 make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 	install
+popd
+
+pushd foomatic-db-hpijs-%{hpijsver}
+make	DESTDIR=%buildroot PREFIX=%{_prefix} \
+	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
@@ -116,9 +136,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc db/source/PPD/Kyocera/*.htm
-%doc README
-%doc COPYING
+%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.htm
+%doc foomatic-db-%{dbver_snap}/README
+%doc foomatic-db-%{dbver_snap}/COPYING
 %{_datadir}/foomatic/db/oldprinterids
 %{_datadir}/foomatic/db/source/printer
 %{_datadir}/foomatic/db/source/driver
@@ -130,6 +150,9 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> 4.0-8.20091126
+- Added foomatic-db-hpijs tarball back in.
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 4.0-7.20091126
 - Updated to foomatic-db-4.0-20091126 (bug #538994).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Nov 2009 10:25:19 -0000	1.4
+++ sources	4 Dec 2009 14:51:10 -0000	1.5
@@ -1 +1,2 @@
 8e14309e17e7544f94f8df429bc691e4  foomatic-db-4.0-20091126.tar.gz
+2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz