diff --git a/.cvsignore b/.cvsignore index bce97ea..e8fc824 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -Omni-printers-0.7.1.tar.bz2 +Omni-printers-0.7.2.tar.bz2 foomatic-2.0.2.tar.gz gimp-print-foomatic-db-4.2.4.tar.bz2 diff --git a/foomatic-2.0.2-fontpath.patch b/foomatic-2.0.2-fontpath.patch new file mode 100644 index 0000000..6688298 --- /dev/null +++ b/foomatic-2.0.2-fontpath.patch @@ -0,0 +1,10 @@ +--- foomatic-2.0.2/foomatic-gswrapper.in.fontpath 2003-01-09 10:57:59.000000000 +0000 ++++ foomatic-2.0.2/foomatic-gswrapper.in 2003-01-09 11:00:16.000000000 +0000 +@@ -41,6 +41,7 @@ + # Execute Ghostscript, with both job and gs errors on stderr, and job + # output on stdout... + ++$ENV{'GS_FONTPATH'} = '/usr/share/fonts'; + print STDERR "foomatic-gswrapper: gs $args 3>&1 1>&2\n"; + exec "gs $args 3>&1 1>&2"; + diff --git a/foomatic.spec b/foomatic.spec index 5a37797..8be5018 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -1,7 +1,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 2.0.2 -Release: 5 +Release: 15 License: GPL Group: System Environment/Libraries @@ -12,7 +12,7 @@ Group: System Environment/Libraries Source0: http://www.linuxprinting.org/download/foomatic/foomatic-%{version}.tar.gz # Build Omni first to get this (you'll have to create the tarball by hand): -Source1: Omni-printers-0.7.1.tar.bz2 +Source1: Omni-printers-0.7.2.tar.bz2 # The foomatic-db info from gimp-print (--with-ijs --with-foomatic) Source2: gimp-print-foomatic-db-4.2.4.tar.bz2 @@ -26,14 +26,24 @@ Patch1: foomatic-1.9-20020517-libdir.patch # Use libdir. Patch2: foomatic-2.0.2-libdir.patch -# Add autodetect information for HP DeskJet 990C. -Patch3: foomatic-2.0.2-hp990c.patch - # Add 'Generic PostScript' model. -Patch4: foomatic-2.0.2-generic-postscript.patch +Patch3: foomatic-2.0.2-generic-postscript.patch + +# Add several HP device IDs. +Patch4: foomatic-2.0.2-ids.patch + +# Set GS_FONTPATH in gs wrapper (bug #81410). +Patch5: foomatic-2.0.2-fontpath.patch + +# This device doesn't advertise an IEEE 1284 ID, but it's a USB +# device so we can figure it out at that level. +Patch6: foomatic-2.0.2-hpdj656c.patch -# Fix Omni XML -Patch5: Omni-printers-badxml.patch +# Pacify printers that don't understand duplex (bug #82385). +Patch7: foomatic-2.0.2-postscript-duplex.patch + +# HPIJS 1.3 data +Patch8: foomatic-2.0.2-hpijs13.patch Url: http://www.linuxprinting.org BuildRequires: perl @@ -73,19 +83,23 @@ The site http://www.linuxprinting.org/ is based on this database. %patch0 -p1 -b .path %patch1 -p1 -b .libdir %patch2 -p1 -b .libdir2 -%patch3 -p1 -b .hp990c +%patch3 -p1 %patch4 -p1 +%patch5 -p1 -b .fontpath +%patch6 -p1 -b .hpdj656c +%patch7 -p1 -b .duplex +%patch8 -p1 -b .hpijs13 # Omni printers tar xjf %{SOURCE1} -pushd Omni-printers -%patch5 -p0 -popd # Gimp-print-4.2.0 driver info rm db/source/driver/stp.xml ( cd db/source; tar xjf %{SOURCE2} ) +# We don't ship hpijs RSS-patched. +perl -pi -e 's;(hpijs)-rss;$1;' db/source/printer/*.xml + ./make_configure %build @@ -158,6 +172,39 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_mandir}/*/* %changelog +* Tue Feb 4 2003 Tim Waugh 2.0.2-15 +- Update data-generators to CVS. + +* Thu Jan 30 2003 Tim Waugh 2.0.2-14 +- Use hpijs, not hpijs-rss (we don't ship the RSS patch now). + +* Thu Jan 23 2003 Tim Waugh 2.0.2-13 +- Pacify printers that don't understand duplex (bug #82385). + +* Wed Jan 22 2003 Tim Powers 2.0.2-12 +- rebuilt + +* Thu Jan 21 2003 Tim Waugh 2.0.2-11 +- Add autodetect info for HP DeskJet 656C. It doesn't really do + IEEE 1284 IDs, but since it's a USB device we can figure out it's + manufacturer and model anyway. + +* Thu Jan 9 2003 Tim Waugh 2.0.2-10 +- Set GS_FONTPATH in gs wrapper (bug #81410). + +* Sat Jan 4 2003 Jeff Johnson 2.0.2-9 +- use internal dep generator. + +* Sun Dec 15 2002 Tim Waugh 2.0.2-8 +- Add several device IDs. + +* Sat Dec 14 2002 Tim Waugh 2.0.2-7 +- Update Omni printers to 0.7.2. +- No longer need Omni badxml patch. + +* Sat Dec 14 2002 Tim Powers 2.0.2-6 +- don't use rpms internal dep generator + * Fri Dec 6 2002 Tim Waugh 2.0.2-5 - Omni XML wasn't well-formed. diff --git a/sources b/sources index aac6016..c1368e1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ca95fa6fb5d576c9f2c8d20598b95b32 Omni-printers-0.7.1.tar.bz2 +b9bfd48487496f134dd3fc7c82cf1d96 Omni-printers-0.7.2.tar.bz2 233a227240e02380b45596e8615d9332 foomatic-2.0.2.tar.gz 850219028293910381b5b229883da78d gimp-print-foomatic-db-4.2.4.tar.bz2