From 08b12cdac182abea14d7d7d51bfb0458c4c793feb5160013daf318f2147aba32 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Oct 2009 22:33:41 +0000 Subject: [PATCH] Accepting request 22460 from Printing Copy from Printing/hplip based on submit request 22460 from user jsmeix OBS-URL: https://build.opensuse.org/request/show/22460 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=44 --- hplip.changes | 22 +++++++++++++ hplip.spec | 88 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 80 insertions(+), 30 deletions(-) diff --git a/hplip.changes b/hplip.changes index 95ce05d..85e59e2 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Oct 15 15:52:41 CEST 2009 - jsmeix@suse.de + +- Also moved /usr/share/hplip/data/models/models.dat + and /etc/hp/hplip.conf to the hplip-hpijs sub-package + so that the "hp" backend can autodetect printers + (see Novell/Suse Bugzilla bnc#546856 comment#10). + +------------------------------------------------------------------- +Thu Oct 15 11:14:28 CEST 2009 - jsmeix@suse.de + +- In the hplip-hpijs sub-package made weak package dependencies + even weaker to avoid bloating of minimal installations. Now + the hplip-hpijs sub-package only "Enhances: ghostscript_any" + and "Suggests: hplip" (see Novell/Suse Bugzilla bnc#546893). +- Enlarged hplip-hpijs to be useful for a CUPS print queue. + Moved the following files from the hplip main package + to the hplip-hpijs sub-package: cups/backend/hp, + cups/filter/foomatic-rip-hplip, cups/filter/hpcac, + cups/filter/hpcups, cups/filter/hplipjs, + and all PPD files (see Novell/Suse Bugzilla bnc#546856). + ------------------------------------------------------------------- Wed Sep 16 14:59:30 CEST 2009 - jsmeix@suse.de diff --git a/hplip.spec b/hplip.spec index 1e3ccba..d62f6b6 100644 --- a/hplip.spec +++ b/hplip.spec @@ -25,7 +25,7 @@ Summary: HP's Printing, Scanning, and Faxing Software # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc Version: 3.9.8 -Release: 2 +Release: 3 Group: Hardware/Printing License: BSD 3-clause (or similar) ; GPL v2 or later ; MIT License (or similar) Url: http://hplipopensource.com @@ -174,25 +174,32 @@ Authors: %package hpijs License: BSD 3-clause (or similar) ; GPL v2 or later ; MIT License (or similar) -Summary: HPIJS for HP's printing and scanning software HPLIP +Summary: Only plain printing with HPLIP printer drivers Group: Hardware/Printing # Since Nov 14 2007 ghostscript-library does no longer require /usr/bin/hpijs # but only "Suggests hplip-hpijs" (see Novell/Suse Bugzilla bnc#341564). -# When ghostscript-library is installed, try to install hplip-hpijs if it is available: -Supplements: ghostscript_any +# Have the matching "reverse suggests" = "Enhances" here +# to document the ghostscript_any <-> hplip-hpijs relationship: +Enhances: ghostscript_any # On a minimalist system only hplip-hpijs may be installed -# (e.g. because of the above supplements for ghostscript_any) # or on a minimalist package repository (e.g. on the openSUSE CDs) # only hplip-hpijs may be available (even when a usual system is installed). # When only hplip-hpijs is there, it should tell the dependency resolver # that for usual functionality, hplip should be installed too (if possible). -# Recommend only the matching version of the hplip main-package +# Unfortunately the installer ignores suggested packages silently +# but on the other hand I cannot use "Recommends hplip" here +# because the installer installs recommended packages silently +# which would bloat a minimal selection (when hplip is available to be installed) +# because the minimal selection contains hplip-hpijs which recommends hplip +# so that the installer installs hplip and all what this requires silently +# see https://bugzilla.novell.com/show_bug.cgi?id=546893 +# Require only the matching version of the hplip main-package # (compare the "Requires: hplip-hpijs" entry above) but do not depend # on the exact matching release because the exact matching release # may be not available to be installed (e.g. when hplip-hpijs-1.2.3-4.5 is # installed from the openSUSE CDs but on our official online repository # only hplip-1.2.3-6.7 is available which should usually also work): -Recommends: hplip = %{version} +Suggests: hplip = %{version} # hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs # so that both packages have a RPM conflict. # But when the minimalist hpijs-standalone is to be replaced @@ -206,16 +213,32 @@ Provides: hpijs-standalone = %{version} Obsoletes: hplip17-hpijs %description hpijs -HPIJS is a Ghostscript printer driver for HP printers. +HPIJS is HPLIP's Ghostscript printer driver for HP printers. +HPCUPS is HPLIP's native CUPS printer driver for HP printers. -This sub-package includes only the hpijs binary and the libhpip library -which is needed to run it. Additionally it needs at least the CUPS -library in the package cups-libs. Normally (in particular when used -with the CUPS printing system) the HPIJS driver needs the rest of HP's -printing and scanning software in the package hplip (in particular the -PPD files for CUPS). For special cases (e.g. for LPRng/lpdfilter or for -a small printing system) it is possible to use only the hpijs binary -and Ghostscript. +This sub-package includes only what is needed for plain printing +with the printer drivers in HPLIP for standard HP printers. + +It does neither provide device status information, +nor support for scanning, nor support for faxing, +nor support for memory card (mass storage) access, +nor support for non-standard devices e.g. no support +for devices which require an additional plugin from HP. + +This sub-package includes in particular: + +The hpijs binary and the libraries libhpip and libhpmud +which are needed to run it. +The HPIJS CUPS filter foomatic-rip-hplip. + +The HPCUPS driver (/usr/lib[64]/cups/filter/hpcups). + +The CUPS backend "hp". + +All HPLIP PPD files (also for HP PostScript printers). + +For the full-featured HPLIP printing and scanning solution, +the main-package package hplip must be installed. For full documentation and license see the main-package hplip. @@ -453,12 +476,12 @@ exit 0 %files %defattr(-, root, root) -%config %{_sysconfdir}/hp/ +%config %{_sysconfdir}/xdg/autostart/hplip-systray.desktop +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/hplip %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %config %{_sysconfdir}/udev/rules.d/55-hpmud.rules %config %{_sysconfdir}/udev/rules.d/56-hpmud_support.rules -%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/hplip %dir %{_datadir}/hal %dir %{_datadir}/hal/fdi %dir %{_datadir}/hal/fdi/information @@ -467,8 +490,6 @@ exit 0 %dir %{_datadir}/hal/fdi/preprobe %dir %{_datadir}/hal/fdi/preprobe/10osvendor %{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi -%{_sysconfdir}/xdg/autostart/hplip-systray.desktop -%{_datadir}/%{name}/ %{_bindir}/hp-align %{_bindir}/hp-check %{_bindir}/hp-clean @@ -507,30 +528,37 @@ exit 0 %{_libdir}/sane/libsane-hpaio.* %dir %{_libdir}/cups %dir %{_libdir}/cups/backend -%{_libdir}/cups/backend/hp %{_libdir}/cups/backend/hpfax %dir %{_libdir}/cups/filter -%{_libdir}/cups/filter/foomatic-rip-hplip -%{_libdir}/cups/filter/hpcac -%{_libdir}/cups/filter/hpcups %{_libdir}/cups/filter/hpcupsfax -%{_libdir}/cups/filter/hplipjs -%dir %{_datadir}/cups -%dir %{_datadir}/cups/model -%dir %{_datadir}/cups/model/manufacturer-PPDs -%{_datadir}/cups/model/manufacturer-PPDs/%{name}/ %dir /var/lib/hp /var/lib/hp/hplip.state %doc %{_defaultdocdir}/%{name}/ %{_bindir}/hp-toolbox.wrapper %{_datadir}/pixmaps/HPmenu.png %{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name}/ +%exclude %{_datadir}/%{name}/data/models/models.dat %files hpijs %defattr(-, root, root) -%doc %{_mandir}/man1/hpijs.1.gz +%config %{_sysconfdir}/hp/ %{_bindir}/hpijs +%doc %{_mandir}/man1/hpijs.1.gz %{_libdir}/libhpip.* %{_libdir}/libhpmud.* +%dir %{_libdir}/cups +%dir %{_libdir}/cups/backend +%{_libdir}/cups/backend/hp +%dir %{_libdir}/cups/filter +%{_libdir}/cups/filter/foomatic-rip-hplip +%{_libdir}/cups/filter/hpcac +%{_libdir}/cups/filter/hpcups +%{_libdir}/cups/filter/hplipjs +%dir %{_datadir}/cups +%dir %{_datadir}/cups/model +%dir %{_datadir}/cups/model/manufacturer-PPDs +%{_datadir}/cups/model/manufacturer-PPDs/%{name}/ +%{_datadir}/%{name}/data/models/models.dat %changelog