From 1044c5bbca290ce957b67af7a828d8fcb2e76555 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 04:51:20 +0000 Subject: auto-import foomatic-1.1-0.20020313.2 from foomatic-1.1-0.20020313.2.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 4dc60e4..3888458 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ Omni-printers.tar.bz2 -foomatic-1.1-20011218.tar.bz2 +foomatic-1.1-20020313.tar.bz2 +gimp-print.tar.bz2 diff --git a/foomatic.spec b/foomatic.spec index 14131d0..e09e73d 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -1,29 +1,41 @@ Summary: Foomatic printer database. Name: foomatic Version: 1.1 -%define release_date 20011218 -%define sub_release 3.5 +%define release_date 20020313 +%define sub_release 2 Release: 0.%{release_date}.%{sub_release} License: GPL Group: System Environment/Libraries # Generated by: # NOW=`date '+%Y%m%d'` -# cvs -z6 -d :pserver:anonymous@cvs.linuxprinting.org:/usr/local/cvs export -D now foomatic +# cvs -d:pserver:anonymous@cvs.linuxprinting.org:/usr/local/cvs export -D $NOW foomatic # tar cjf foomatic-1.1-$NOW.tar.bz2 foomatic -Source: foomatic-1.1-%{release_date}.tar.bz2 -Source1: Omni-printers.tar.bz2 +Source0: foomatic-1.1-%{release_date}.tar.bz2 -Patch0: foomatic-1.1-20011218-prepend.patch -Patch1: foomatic-1.1-20011218-utf8.patch -Patch2: foomatic-1.1-20011218-lpdomatic.patch -Patch3: foomatic-1.1-20011218-fd3.patch -Patch4: foomatic-1.1-20020131-sys.patch +# Build Omni first to get this (you'll have to create the tarball by hand): +Source1: Omni-printers.tar.bz2 + +# The foomatic-db info from gimp-print-4.2.0 +Source2: gimp-print.tar.bz2 + +# Script for generating cups-drivers package +Source3: gen-ppds + +# Look in /usr/local/bin last, not first, in lpdomatic (bug #57915). +Patch0: foomatic-1.1-20020306-path.patch + +# Allow libdir and bindir to be overridden. +Patch1: foomatic-1.1-20020130-libdir.patch + +# Back off to 1.0.2 for hpijs driver data. +Patch2: foomatic-1.1-hpijs-1.0.2.patch Url: http://www.linuxprinting.org BuildRequires: perl -Requires: perl +Requires: perl >= 5.6.1 BuildRoot: %_tmppath/%name-%version-%release-root +Provides: perl(Foomatic::GrovePath) Requires: perl-Storable >= 0.6.11, perl-DateManip >= 5.39, perl-libxml-enno >= 1.02 Requires: perl-libxml-perl >= 0.07, perl-Parse-Yapp >= 1.04, perl-XML-Dumper >= 0.4 Requires: perl-XML-Encoding >= 1.01, perl-XML-Parser >= 2.29, perl-XML-Twig >= 2.02 @@ -34,6 +46,10 @@ BuildRequires: perl-Storable >= 0.6.11, perl-DateManip >= 5.39, perl-libxml-enno BuildRequires: perl-libxml-perl >= 0.07, perl-Parse-Yapp >= 1.04, perl-XML-Dumper >= 0.4 BuildRequires: perl-XML-Encoding >= 1.01, perl-XML-Parser >= 2.29, perl-XML-Twig >= 2.02 BuildRequires: perl-XML-Grove, perl-libwww-perl +BuildRequires: perl-URI + +# We need ghostscript to have the gimp-print-4.2.0 driver. +Conflicts: ghostscript < 6.52 %description Foomatic is a comprehensive, spooler-independent database of printers, @@ -47,25 +63,53 @@ There are spooler-independent command line interfaces to manipulate queues (foomatic-configure) and to print files/manipulate jobs (foomatic printjob). -The site http://www.linuxprinting.org/ is based in this database. +The site http://www.linuxprinting.org/ is based on this database. + +%package -n cups-drivers +Summary: Printer drivers for CUPS +Requires: cups >= 1.1.10-3 +Requires: ghostscript +Prereq: /sbin/service +Group: System Environment/Daemons + +%description -n cups-drivers +Printer drivers for the CUPS printing system + +%package -n cups-drivers-pnm2ppa +Summary: CUPS drivers for PPA (HP-compatible GDI) printers +Requires: pnm2ppa +Requires: ghostscript +Prereq: /sbin/service +Group: System Environment/Daemons + +%description -n cups-drivers-pnm2ppa +CUPS drivers for PPA (HP-compatible GDI) printers + +%package -n cups-drivers-hpijs +Summary: CUPS drivers for HP printers using the optimized hpijs driver +Requires: hpijs >= 1.0.1 +Requires: ghostscript >= 6.52-2 +Prereq: /sbin/service +Group: System Environment/Daemons + +%description -n cups-drivers-hpijs +CUPS drivers for HP printers using the optimized hpijs driver %prep %setup -q -n foomatic -# Fix prepends in lpdomatic (bug #57371) -%patch0 -p1 -b .prepend -# Fix PCL fixup code (bug #55909, others) -%patch1 -p1 -# Put lpdomatic in /usr/sbin again. -%patch2 -p1 -b .lpdomatic -# Fix foomatic-gswrapper's file descriptor manipulations (bug #43619). -%patch3 -p1 -b .fd3 -# Fix a thinko in DB.pl. -%patch4 -p1 +%patch0 -p1 -b .path +%patch1 -p1 -b .libdir +patch db/source/driver/hpijs.xml -b -z .hpijs1.0.2 < %{PATCH2} +# Omni printers tar xjf %{SOURCE1} +# Gimp-print-4.2.0 driver info +rm db/source/driver/stp.xml +( cd db/source; tar xjf %{SOURCE2} ) + %build -make PREFIX=%{_prefix} INSTALLPREFIX=%buildroot +make PREFIX=%{_prefix} INSTALLPREFIX=%buildroot CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -93,6 +137,24 @@ cd .. mkdir -p $RPM_BUILD_ROOT/var/cache/foomatic/{pcache,compiled} +# cups-drivers packages +mv %{buildroot}/%{_datadir}/foomatic/db/compiled{,.moved} +mv %{buildroot}/%{_datadir}/foomatic/db/pcache{,.moved} +mkdir -p $RPM_BUILD_DIR/%{name}/foomatic-cache +export FOOMATIC_CACHEDIR="$RPM_BUILD_DIR/%{name}/foomatic-cache" +export FOOMATIC_LIBDIR="%{buildroot}/%{_datadir}/foomatic" +export FOOMATIC_BINDIR="%{buildroot}/%{_bindir}" +export FOOMATIC_SBINDIR="%{buildroot}/%{_sbindir}" +export FOOMATIC_PERLINC="%{buildroot}/$installsitelib" +%{SOURCE3} "$RPM_BUILD_ROOT/%{_datadir}/cups/model/foomatic" \ + "$RPM_BUILD_DIR/%{name}" +mkdir -p $RPM_BUILD_ROOT/%{_bindir} +install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir} +perl -pi -e "s,^$RPM_BUILD_ROOT,,g" $RPM_BUILD_DIR/%{name}/filelist.* +perl -pi -e "s,^%dir $RPM_BUILD_ROOT,,g" $RPM_BUILD_DIR/%{name}/filelist.* +mv %{buildroot}/%{_datadir}/foomatic/db/compiled{.moved,} +mv %{buildroot}/%{_datadir}/foomatic/db/pcache{.moved,} + %post # zap the cache rm -rf /var/cache/foomatic/pcache/* /var/cache/foomatic/compiled/* @@ -103,33 +165,118 @@ if [ -x /usr/sbin/printconf-backend ] ; then fi # restart the print server if it is running now -if /sbin/service lpd status 2>&1 > /dev/null ; then - /sbin/service lpd restart 2>&1 > /dev/null +if /sbin/service lpd status >/dev/null 2>&1 ; then + /sbin/service lpd restart >/dev/null 2>&1 fi exit 0 %clean -rm -fr %buildroot +rm -fr %buildroot $RPM_BUILD_DIR/%{name} %files %defattr(-,root,root) %doc README USAGE ChangeLog -%_bindir/* -%_sbindir/* -%_libdir/perl5/site_perl/*/Foomatic -%dir %_libdir/cups -%_libdir/cups/* +%{_bindir}/* +%{_sbindir}/* +%{_libdir}/perl5/site_perl/*/Foomatic +%dir %{_libdir}/cups +%{_libdir}/cups/* %dir /var/cache/foomatic -%_datadir/* +%{_datadir}/foomatic +%{_mandir}/*/* + +%files -n cups-drivers -f filelist.main +%defattr(-,root,root) +%{_bindir}/gen-ppds + +%post -n cups-drivers +/sbin/service cups condrestart || : + +%postun -n cups-drivers +/sbin/service cups condrestart || : + +%files -n cups-drivers-pnm2ppa -f filelist.pnm2ppa + +%post -n cups-drivers-pnm2ppa +/sbin/service cups condrestart || : + +%postun -n cups-drivers-pnm2ppa +/sbin/service cups condrestart || : + +%files -n cups-drivers-hpijs -f filelist.hpijs + +%post -n cups-drivers-hpijs +/sbin/service cups condrestart || : + +%postun -n cups-drivers-hpijs +/sbin/service cups condrestart || : %changelog -* Fri May 03 2002 Philip Copeland 1.1-0.20011218.3.5 -- rebuild for alpha +* Wed Apr 3 2002 Tim Waugh 1.1-0.20020313.2 +- Back off to 1.0.2 for hpijs driver data (bug #62587). + +* Thu Mar 14 2002 Tim Waugh 1.1-0.20020313.1 +- Update to CVS. + +* Wed Mar 6 2002 Tim Waugh 1.1-0.20020306.1 +- Update to CVS. +- Patches no longer needed: conffile, sys, cachedir, fd0. +- Adapted path patch. + +* Tue Mar 5 2002 Tim Waugh 1.1-0.20020130.10 +- Fix bug #58319. +- Drop dbg patch. -* Tue Feb 5 2002 Tim Waugh 1.1-0.20011218.3 +* Mon Feb 25 2002 Tim Waugh 1.1-0.20020130.9 +- Fix file lists. + +* Mon Feb 25 2002 Tim Waugh 1.1-0.20020130.8 +- Fix %post scriplet bug (bug #59942). + +* Thu Feb 21 2002 Tim Waugh 1.1-0.20020130.7 +- Rebuild in new environment. + +* Wed Feb 13 2002 Tim Waugh 1.1-0.20020130.6 +- Merge cups-drivers. No epoch needed. +- Require perl-URI. + +* Wed Feb 06 2002 Tim Waugh 1.1-0.20020130.5 +- Cache fix. + +* Mon Feb 4 2002 Tim Waugh 1.1-0.20020130.4 +- Don't ship backup files. + +* Mon Feb 4 2002 Tim Waugh 1.1-0.20020130.3 +- Rebuild to pick up new perl installsitelib. + +* Thu Jan 31 2002 Tim Waugh 1.1-0.20020130.2 - Fix a thinko in DB.pl. +* Wed Jan 30 2002 Tim Waugh 1.1-0.20020130.1 +- Update to CVS. +- No longer need the cachedir patch. +- Fix config file path. +- Look in /usr/local/bin last, not first, in lpdomatic (bug #57915). + +* Tue Jan 29 2002 Tim Waugh 1.1-0.20020129.1 +- Update to CVS. +- Patches no longer needed: prepend, fd3. +- Use RPM_OPT_FLAGS. +- Allow non-root users to use foomatic-datafile (bug #58956). + +* Sat Jan 26 2002 Jeff Johnson 1.1-0.20020124.2 +- added Provides: perl(Foomatic::GrovePath) + +* Thu Jan 24 2002 Tim Waugh 1.1-0.20020124.1 +- Update to CVS. +- Updated Omni printers to those in Omni 0.5.1. +- Updated patches: prepend, fd3. +- Patches no longer needed: utf8, lpdomatic. +- Added gimp-print (formerly stp) foomatic db info, and removed the old + stp.xml file. +- Conflict with ghostscript if it doesn't have gimp-print-4.2.0 yet. + * Fri Jan 18 2002 Tim Waugh 1.1-0.20011218.2 - REALLY fix PCL fixup code (bug #55909, others). - PreReq fileutils, initscripts (bug #56984). diff --git a/sources b/sources index d380d57..19be59f 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -405917d212860f14c7b8bf38a53a07fd Omni-printers.tar.bz2 -fa10a0d6124401d0003f67db97268d7d foomatic-1.1-20011218.tar.bz2 +59bce92c9e46045153e512fecbf2dd08 Omni-printers.tar.bz2 +25bcd3a08ce503cf75c4bde836b0c2b2 foomatic-1.1-20020313.tar.bz2 +659e6fb2af2f721c1f0d206242ba517e gimp-print.tar.bz2