diff --git a/.cvsignore b/.cvsignore index e8fc824..a8c7a08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,6 @@ -Omni-printers-0.7.2.tar.bz2 -foomatic-2.0.2.tar.gz +Omni-printers-0.9.0.tar.bz2 +foomatic-db-20030603.tar.gz +foomatic-db-engine-3.0.0.tar.gz +foomatic-db-hpijs-1.3.1-4.tar.gz +foomatic-filters-3.0.0.tar.gz gimp-print-foomatic-db-4.2.4.tar.bz2 diff --git a/foomatic-db-engine-libdir.patch b/foomatic-db-engine-libdir.patch new file mode 100644 index 0000000..a1bc149 --- /dev/null +++ b/foomatic-db-engine-libdir.patch @@ -0,0 +1,43 @@ +--- foomatic-db-engine-3.0.0beta2/configure.in.libdir 2003-04-02 13:01:42.000000000 +0100 ++++ foomatic-db-engine-3.0.0beta2/configure.in 2003-04-02 13:10:00.000000000 +0100 +@@ -42,8 +42,8 @@ + SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc + SBINSEARCHPATH=/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin + BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin +-DATASEARCHPATH=/usr/share:/usr/local/share:/usr/lib:/usr/local/lib:/opt +-LIBSEARCHPATH=/usr/lib:/lib:/usr/local/lib:/opt ++DATASEARCHPATH=/usr/share:/usr/local/share:$libdir:/usr/local/lib:/opt ++LIBSEARCHPATH=$libdir:/lib:/usr/local/lib:/opt + PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal + MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev + +@@ -106,8 +106,8 @@ + AC_PATH_PROGS(CUPS_ADMIN,lpadmin,/usr/sbin/lpadmin,$SBINSEARCHPATH) + AC_PATH_PROGS(CUPS_LPSTAT,lpstat,/usr/bin/lpstat,$BINSEARCHPATH) + AC_PATH_DIRS(CUPS_PPDS,cups/model,/usr/share/cups/model,$DATASEARCHPATH) +-AC_PATH_DIRS(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$DATASEARCHPATH) +-AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$DATASEARCHPATH) ++AC_PATH_DIRS(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$DATASEARCHPATH) ++AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,$libdir/cups/backend,$DATASEARCHPATH) + AC_PATH_PROGS(CUPS_PCONF,cups/printers.conf,$CUPS_ETC/printers.conf,$SYSCONFSEARCHPATH) + AC_PATH_PROGS(CUPS_LPR,lpr-cups lpr,/usr/bin/lpr,$BINSEARCHPATH) + AC_PATH_PROGS(CUPS_LPQ,lpq-cups lpq,/usr/bin/lpq,$BINSEARCHPATH) +@@ -124,15 +124,15 @@ + AC_PATH_PROGS(CUPS_LPINFO,lpinfo,/usr/sbin/lpinfo,$SBINSEARCHPATH) + + dnl Paths for PDQ +-AC_PATH_DIRS(PDQ_CONF,pdq,/usr/lib/pdq,$SYSCONFSEARCHPATH:$LIBSEARCHPATH) ++AC_PATH_DIRS(PDQ_CONF,pdq,$libdir/pdq,$SYSCONFSEARCHPATH:$LIBSEARCHPATH) + AC_PATH_PROGS(PDQ_PRINTRC,pdq/printrc,$PDQ_CONF/printrc,$SYSCONFSEARCHPATH:$LIBSEARCHPATH) + dnl PDQ_FOOMATIC=$PDQ_CONF/drivers/foomatic + AC_PATH_PROGS(PDQ_PRINT,pdq lpr-pdq,/usr/bin/pdq,$BINSEARCHPATH) + dnl PDQ_JOBDIR=~/.printjobs + + dnl Paths for PPR +-AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,/usr/lib/ppr/bin/pprd,$LIBSEARCHPATH) +-AC_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH) ++AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,$libdir/ppr/bin/pprd,$LIBSEARCHPATH) ++AC_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH) + AC_PATH_DIRS(PPR_PPDFILES,ppr/PPDFiles,/usr/share/ppr/PPDFiles,$DATASEARCHPATH) + AC_PATH_DIRS(PPR_ETC,ppr,/etc/ppr,$SYSCONFSEARCHPATH) + AC_PATH_PROGS(PPR_PPR,ppr lpr-ppr,/usr/bin/ppr,$BINSEARCHPATH) diff --git a/foomatic-filters-libdir.patch b/foomatic-filters-libdir.patch new file mode 100644 index 0000000..b963600 --- /dev/null +++ b/foomatic-filters-libdir.patch @@ -0,0 +1,38 @@ +--- foomatic-filters-3.0.0beta2/configure.in.libdir 2003-04-02 12:56:22.000000000 +0100 ++++ foomatic-filters-3.0.0beta2/configure.in 2003-04-02 13:00:49.000000000 +0100 +@@ -14,8 +14,8 @@ + + SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc + BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin +-DATASEARCHPATH=/usr/share:/usr/local/share:/usr/lib:/usr/local/lib:/opt +-LIBSEARCHPATH=/usr/lib:/lib:/usr/local/lib:/opt ++DATASEARCHPATH=/usr/share:/usr/local/share:$libdir:/usr/local/lib:/opt ++LIBSEARCHPATH=$libdir:/lib:/usr/local/lib:/opt + + dnl Check for Perl + AC_PATH_PROGS(PERL,perl,/usr/bin/perl,$BINSEARCHPATH) +@@ -24,19 +24,19 @@ + AC_PATH_PROGS(PRINTCAP,printcap,/etc/printcap,$SYSCONFSEARCHPATH) + + dnl Check for /usr/lib/cups +-AC_PATH_DIRS(CUPS,cups,/usr/lib/cups,$LIBSEARCHPATH) ++AC_PATH_DIRS(CUPS,cups,$libdir/cups,$LIBSEARCHPATH) + + dnl Check for /usr/lib/cups/filter +-AC_PATH_DIRS(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$LIBSEARCHPATH) ++AC_PATH_DIRS(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$LIBSEARCHPATH) + + dnl Check for /usr/lib/ppr +-AC_PATH_DIRS(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH) ++AC_PATH_DIRS(PPR,ppr,$libdir/ppr,$LIBSEARCHPATH) + + dnl Check for /usr/lib/ppr/interfaces +-AC_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH) ++AC_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH) + + dnl Check for /usr/lib/ppr/lib +-AC_PATH_DIRS(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH) ++AC_PATH_DIRS(PPR_LIB,ppr/lib,$libdir/ppr/lib,$LIBSEARCHPATH) + + dnl AC_OUTPUT(Makefile src/Makefile) + AC_OUTPUT(Makefile makeMan foomatic-gswrapper foomatic-rip) diff --git a/foomatic.spec b/foomatic.spec index 484aa01..9f0228c 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -1,7 +1,11 @@ +%define dbver 20030603 +%define enginever 3.0.0 +%define hpijsver 1.3.1-4 + Summary: Foomatic printer database. Name: foomatic -Version: 2.0.2 -Release: 15.1 +Version: 3.0.0 +Release: 9 License: GPL Group: System Environment/Libraries @@ -9,28 +13,24 @@ Group: System Environment/Libraries # NOW=`date '+%Y%m%d'` # cvs -d:pserver:anonymous@cvs.linuxprinting.org:/usr/local/cvs export -D $NOW foomatic # tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic -Source0: http://www.linuxprinting.org/download/foomatic/foomatic-%{version}.tar.gz +Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz + +Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{enginever}.tar.gz +Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{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): -Source1: Omni-printers-0.7.2.tar.bz2 +Source4: Omni-printers-0.9.0.tar.bz2 # The foomatic-db info from gimp-print (--with-ijs --with-foomatic) -Source2: gimp-print-foomatic-db-4.2.4.tar.bz2 +Source5: gimp-print-foomatic-db-4.2.4.tar.bz2 # Look in /usr/local/bin last, not first, in lpdomatic (bug #57915). -Patch0: foomatic-1.9-20020517-path.patch - -# Allow libdir and bindir to be overridden. -Patch1: foomatic-1.9-20020517-libdir.patch +Patch0: foomatic-filters-path.patch # Use libdir. -Patch2: foomatic-2.0.2-libdir.patch - -# Add 'Generic PostScript' model. -Patch3: foomatic-2.0.2-generic-postscript.patch - -# Add several HP device IDs. -Patch4: foomatic-2.0.2-ids.patch +Patch1: foomatic-filters-libdir.patch +Patch2: foomatic-db-engine-libdir.patch # Set GS_FONTPATH in gs wrapper (bug #81410). Patch5: foomatic-2.0.2-fontpath.patch @@ -39,25 +39,15 @@ Patch5: foomatic-2.0.2-fontpath.patch # device so we can figure it out at that level. Patch6: foomatic-2.0.2-hpdj656c.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 - -# Fix PS/PJL conflicts in Duplex options (bug #86510). -Patch9: foomatic-2.0.2-duplex184.patch - -# Fix some printer models whose recommended driver is not shipped -# (bug #89455). -Patch10: foomatic-db-nodrv.patch +# Add some Dell printers. +Patch7: foomatic-db-dell.patch Url: http://www.linuxprinting.org -BuildRequires: perl -Requires: perl >= 5.6.1 +BuildRequires: perl >= 3:5.8.1 +Requires: perl >= 3:5.8.1 BuildRoot: %_tmppath/%name-%version-%release-root Provides: perl(Foomatic::GrovePath) -Requires: perl-DateManip >= 5.39, perl-libxml-enno >= 1.02 +Requires: 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 # For 'rm' and '/sbin/service' in post @@ -86,78 +76,130 @@ queues (foomatic-configure) and to print files/manipulate jobs The site http://www.linuxprinting.org/ is based on this database. %prep -%setup -q +%setup -q -c -a 1 -a 2 -a 3 + +pushd foomatic-filters-%{enginever} %patch0 -p1 -b .path %patch1 -p1 -b .libdir -%patch2 -p1 -b .libdir2 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 -b .fontpath +./make_configure +popd + +pushd foomatic-db-engine-%{enginever} +%patch2 -p1 -b .libdir +./make_configure +popd + +pushd foomatic-db-%{dbver} %patch6 -p1 -b .hpdj656c -%patch7 -p1 -b .duplex -%patch8 -p1 -b .hpijs13 -%patch9 -p1 -b .duplex184 -%patch10 -p1 -b .nodrv +%patch7 -p1 -b .dell # Omni printers -tar xjf %{SOURCE1} +tar xjf %{SOURCE4} # Gimp-print-4.2.0 driver info rm db/source/driver/stp.xml -( cd db/source; tar xjf %{SOURCE2} ) +pushd db/source +tar xjf %{SOURCE5} +popd -# We don't ship hpijs RSS-patched. -perl -pi -e 's;(hpijs)-rss;$1;' db/source/printer/*.xml +popd -# Fix lpdomatic bug (bug #88171). -perl -pi -e 's:/S/:/\\S/:g' src/[dl]*omatic.pl.in +%build +pushd foomatic-filters-%{enginever} +%configure +make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" +popd -./make_configure +pushd foomatic-db-engine-%{enginever} +%configure --disable-xmltest +make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" +popd -%build +pushd foomatic-db-%{dbver} +%configure +make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" +popd + +pushd foomatic-db-hpijs-%{hpijsver} %configure -make PREFIX=%{_prefix} INSTALLPREFIX=%buildroot CFLAGS="$RPM_OPT_FLAGS" +make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" +popd %install rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installvendorlib'` +pushd foomatic-filters-%{enginever} +eval `perl '-V:installvendorlib' '-V:installvendorarch'` mkdir -p $RPM_BUILD_ROOT/$installvendorlib export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib +export INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch make DESTDIR=%buildroot PREFIX=%{_prefix} \ - INSTALLPREFIX=%buildroot \ INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \ + INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \ install +popd -# Remove drivers with no command line. -./foomatic-cleanupdrivers $RPM_BUILD_ROOT/usr/share/foomatic +pushd foomatic-db-engine-%{enginever} +make DESTDIR=%buildroot PREFIX=%{_prefix} \ + INSTALLSITELIB=$installvendorlib \ + INSTALLSITEARCH=$installvendorarch \ + install +popd + +pushd foomatic-db-%{dbver} +make DESTDIR=%buildroot PREFIX=%{_prefix} \ + INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \ + INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \ + install # Install printers from the Omni project, if there isn't already an entry -cd Omni-printers; +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 .. +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.05 -rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bj8pa06n,bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml +# 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 -mkdir -p $RPM_BUILD_ROOT/var/cache/foomatic/{pcache,compiled} +# Remove drivers with no command line. +pushd foomatic-db-engine-%{enginever} +./foomatic-cleanupdrivers %{buildroot}%{_datadir}/foomatic +popd + +# Update any old-style printer IDs still left around. +echo '#!/usr/bin/perl -pi' > convert-printerids.pl +sed -e 's|^\(.*\) \(.*\)$|s,printer/\1,printer/\2,g;|' \ + %{buildroot}%{_datadir}/foomatic/db/oldprinterids \ + >> convert-printerids.pl +chmod a+x convert-printerids.pl +./convert-printerids.pl %{buildroot}%{_datadir}/foomatic/db/source/{opt,driver}/*.xml # Remove things we don't ship. rm -rf $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl \ $RPM_BUILD_ROOT%{_libdir}/ppr +find $RPM_BUILD_ROOT -name .packlist | xargs rm -f %post -# zap the cache -rm -rf /var/cache/foomatic/pcache/* /var/cache/foomatic/compiled/* - # Try to rebuild the printconf data +if [ -x /usr/share/printconf/util/updateconf.py ] ; then + /usr/share/printconf/util/updateconf.py >/dev/null 2>&1 +fi if [ -x /usr/sbin/printconf-backend ] ; then - /usr/sbin/printconf-backend --force-rebuild > /dev/null 2> /dev/null + /usr/sbin/printconf-backend --force-rebuild >/dev/null 2>&1 fi # restart the print server if it is running now @@ -171,7 +213,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %files %defattr(-,root,root) -%doc README USAGE ChangeLog +%doc --parents */README */USAGE */ChangeLog %dir %{_sysconfdir}/foomatic %config(noreplace) %{_sysconfdir}/foomatic/filter.conf %{_bindir}/* @@ -179,16 +221,66 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic %dir %{_libdir}/cups %{_libdir}/cups/* -%dir /var/cache/foomatic %{_datadir}/foomatic %{_mandir}/*/* %changelog -* Wed May 21 2003 Tim Waugh 2.0.2-15.1 +* Mon Oct 27 2003 Tim Waugh 3.0.0-9 +- Recommend omni-compiled for Omni drivers (bug #107965). + +* Mon Sep 29 2003 Tim Waugh +- No longer requires Date::Manip (bug #105696). + +* Thu Sep 4 2003 Tim Waugh 3.0.0-8 +- Build requires latest perl (bug #103630). + +* Tue Aug 5 2003 Elliot Lee 3.0.0-7 +- Fix install to find perl modules + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Tue Jun 3 2003 Tim Waugh 3.0.0-5 +- Add some Dell printers. +- Updated foomatic-db to 20030603. +- Updated missing UPP list for ghostscript 7.07. + +* Wed May 21 2003 Tim Waugh 3.0.0-4 - Fix some printer models whose recommended driver is not shipped (bug #89455). + +* Mon May 19 2003 Tim Waugh 3.0.0-3 +- Relax perl requirement. Rebuild for perl 5.8.0. + +* Mon May 19 2003 Tim Waugh 3.0.0-2 +- Disable the xmltest during configure (it hangs on ppc). +- Requires newer perl (bug #91129). + +* Wed Apr 30 2003 Tim Waugh 3.0.0-1 +- 3.0.0. + +* Fri Apr 4 2003 Tim Waugh +- Update Omni printers to 0.9.0. + +* Wed Apr 2 2003 Tim Waugh 3.0.0-0.beta2.1 +- 3.0.0beta2. +- Updated path patch. +- No longer need FOOMATIC_LIBDIR, generic PS, ids, postscript-duplex, + hpijs13, psc2210, duplex184 patches. +- Add hpijs support back in. +- Fix up references to old printer IDs. + +* Wed Mar 26 2003 Tim Waugh 2.0.2-18 - Fix PS/PJL conflicts in Duplex options (bug #86510). -- Fix lpdomatic bug (bug #88171). + +* Fri Mar 21 2003 Tim Waugh 2.0.2-17 +- Update Omni printers to 0.7.3. + +* Wed Mar 19 2003 Tim Waugh 2.0.2-16 +- Add autodetect info for HP PSC 2210. * Tue Feb 4 2003 Tim Waugh 2.0.2-15 - Update data-generators to CVS. diff --git a/sources b/sources index c1368e1..cb90448 100644 --- a/sources +++ b/sources @@ -1,3 +1,6 @@ -b9bfd48487496f134dd3fc7c82cf1d96 Omni-printers-0.7.2.tar.bz2 -233a227240e02380b45596e8615d9332 foomatic-2.0.2.tar.gz +0185122c75ff716a0834f5a16c3692fd Omni-printers-0.9.0.tar.bz2 +819cea2a2c899cf2789bc2bfc0e567e0 foomatic-db-20030603.tar.gz +a3c0b0fc6662a7b9afab09cbe74bb292 foomatic-db-engine-3.0.0.tar.gz +23a5a96ac71eb703a59d6e8ab0c22de2 foomatic-db-hpijs-1.3.1-4.tar.gz +970e7fed64ee9f56e28ccd798af88918 foomatic-filters-3.0.0.tar.gz 850219028293910381b5b229883da78d gimp-print-foomatic-db-4.2.4.tar.bz2