From 2b2fdc27134199b61eb7ae94493cc1c600b811e4e5a64c5bab86736add38495e Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Wed, 27 Oct 2010 15:37:28 +0000 Subject: [PATCH] Accepting request 51497 from home:jsmeix:branches:Printing Version upgrade to 3.10.9 and added hp-systray.wrapper to increase desktop startup speed (bnc#649280) OBS-URL: https://build.opensuse.org/request/show/51497 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=16 --- change-udev-rules.diff | 24 ++++++++++++++++-------- hp-systray.wrapper | 17 +++++++++++++++++ hplip-3.10.2.tar.bz2 | 3 --- hplip-3.10.9.tar.bz2 | 3 +++ hplip.changes | 35 +++++++++++++++++++++++++++++++++++ hplip.spec | 17 +++++++++++++++-- 6 files changed, 86 insertions(+), 13 deletions(-) create mode 100644 hp-systray.wrapper delete mode 100644 hplip-3.10.2.tar.bz2 create mode 100644 hplip-3.10.9.tar.bz2 diff --git a/change-udev-rules.diff b/change-udev-rules.diff index 5e311b3..e8272fb 100644 --- a/change-udev-rules.diff +++ b/change-udev-rules.diff @@ -1,6 +1,6 @@ ---- data/rules/55-hpmud.rules.orig 2010-02-25 00:06:35.000000000 +0100 -+++ data/rules/55-hpmud.rules 2010-04-01 12:18:54.000000000 +0200 -@@ -12,138 +12,180 @@ +--- data/rules/55-hpmud.rules.orig 2010-09-26 19:06:17.000000000 +0200 ++++ data/rules/55-hpmud.rules 2010-10-27 16:19:36.000000000 +0200 +@@ -12,140 +12,183 @@ # 3. This rules file is an attempt at being compatable with all distros. Feel free to make your own changes and if you feel your # changes are not distro specific please send your patch to us. 2/11/2009, D Suffield # @@ -222,11 +222,14 @@ # Check for LaserJet products (0x03f0xx17). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660" +ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes" + # Check for LaserJet products (0x03f0xx2a). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes" # Removed the following rule because FHS states that /etc should be reserved for static files only. This # functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield # -+# Novell/Suse re-enabled it ++# Novell/openSUSE re-enabled it +# because it is how it works with SANE regardless what FHS think how it should work. +# Files in /etc/ are config files which can be adapted as needed during runtime. +# Adapting /etc/sane.d/dll.conf only during package install time is insufficient @@ -241,9 +244,10 @@ +ENV{libsane_matched}=="yes", RUN+="/bin/sh -c 'test -e /sys/$env{DEVPATH}/power/level && echo on > /sys/$env{DEVPATH}/power/level'" LABEL="hpmud_rules_end" ---- data/rules/56-hpmud_support.rules.orig 2010-02-25 00:06:35.000000000 +0100 -+++ data/rules/56-hpmud_support.rules 2010-04-01 11:58:11.000000000 +0200 -@@ -1,14 +1,14 @@ ++ +--- data/rules/56-hpmud_support.rules.orig 2010-09-26 19:06:17.000000000 +0200 ++++ data/rules/56-hpmud_support.rules 2010-10-27 16:22:48.000000000 +0200 +@@ -1,15 +1,17 @@ # HPLIP udev rules file. Notify console user if plugin support is required for this device. -ACTION!="add", GOTO="hpmud_rules_end" @@ -259,9 +263,13 @@ # Check for LaserJet products (0x03f0xx17). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" +ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" - + # Check for LaserJet products (0x03f0xx2a). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" -LABEL="hpmud_rules_end" \ No newline at end of file +LABEL="hpmud_support_rules_end" ++ diff --git a/hp-systray.wrapper b/hp-systray.wrapper new file mode 100644 index 0000000..2bd7883 --- /dev/null +++ b/hp-systray.wrapper @@ -0,0 +1,17 @@ +#! /bin/bash + +# Be polite and sleep a bit to let more important processes go ahead +# (in particular after booting let the cupsd finish its startup): +sleep 10 +# Run hp-systray only if an appropriate local print queue exists +# (i.e. on localhost a queue with a "hp:/..." DeviceURI) +# see https://bugzilla.novell.com/show_bug.cgi?id=649280 +# otherwise and in case of any error do an unnoticeable exit: +set -o pipefail +lpstat -h localhost -v | grep -q ': hp:/' || exit 0 +# Replace this wrapper with the actual command +# so that it exits with the exit code of the command +# and that the command gets any signals directly, +# see https://bugzilla.novell.com/show_bug.cgi?id=499735 +exec hp-systray + diff --git a/hplip-3.10.2.tar.bz2 b/hplip-3.10.2.tar.bz2 deleted file mode 100644 index 8bb3fd1..0000000 --- a/hplip-3.10.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:510a8d123f89b77d8e43c5714856e54985a4f777b99f9202bdeedf2c2cfd9e27 -size 19593734 diff --git a/hplip-3.10.9.tar.bz2 b/hplip-3.10.9.tar.bz2 new file mode 100644 index 0000000..e2f24cb --- /dev/null +++ b/hplip-3.10.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:985520e4738b6064707d5bc914f7a570b8efd66d5160754bc61cdd76bfd442c1 +size 19886788 diff --git a/hplip.changes b/hplip.changes index ada522b..66508db 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Wed Oct 27 16:34:11 CEST 2010 - jsmeix@suse.de + +- Added hp-systray.wrapper which is called + via /etc/xdg/autostart/hplip-systray.desktop + to increase desktop startup speed so that the purpose + of this hp-systray.wrapper is different to the + entry below dated "Tue Apr 8 14:56:53 CEST 2008". + hp-systray.wrapper tests via "lpstat" if a 'hp:/...' + print queue exists and exits otherwise. + This avoids that hp-systray with all its Python stuff must be + loaded when the desktop starts up only to let hp-systray do + its built-in test and exit if there is no HPLIP print queue + (see Novell/openSUSE Bugzilla bnc#649280). +- Updated to version 3.10.9: + New Scan protocol (Low End Data Model) support. + Many more supported all-in-one devices. + Many bug fixies. + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 3.10.6: + New protocol support (LEDM) for device status over Network + and USB. + Some more supported all-in-one devices. + Several bug fixies. + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Updated to version 3.10.5: + Fixed "libusb couldn't open USB device, Permission denied" + error message in openSUSE. + Several more supported all-in-one devices. + Several bug fixies. + For details see + http://hplipopensource.com/hplip-web/release_notes.html + ------------------------------------------------------------------- Wed Sep 15 08:58:09 UTC 2010 - aj@suse.de diff --git a/hplip.spec b/hplip.spec index c6417fe..f3f4f13 100644 --- a/hplip.spec +++ b/hplip.spec @@ -29,13 +29,13 @@ Summary: HP's Printing, Scanning, and Faxing Software # HPLIP has reached 1.0 status. With this release a date encoded revision number is used: # 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.10.2 +Version: 3.10.9 Release: 4 Group: Hardware/Printing License: BSD3c(or similar) ; GPLv2+ ; MIT License (or similar) Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://downloads.sourceforge.net/project/hplip/hplip/3.10.2/hplip-3.10.2.tar.gz?use_mirror=freefr +# URL for Source0: http://downloads.sourceforge.net/project/hplip/hplip/3.10.9/hplip-3.10.9.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fhplip%2Ffiles%2Fhplip%2F3.10.9%2Fhplip-3.10.9.tar.gz%2Fdownload%3Fuse_mirror%3Dpuzzle&ts=1288186183&use_mirror=mesh Source0: %{name}-%{version}.tar.bz2 # Patch0...Patch9 is for patches from HP: # Patch10...Patch99 is for Suse patches for the sources from HP: @@ -60,6 +60,12 @@ Source102: hpijs.1.gz # according to the init-suse-firewall in the tar ball # (compare also Novell/Suse Bugzilla bnc#498429): Source105: hplip.SuSEfirewall2 +# Source106 is a wrapper for hp-systray which tests via "lpstat" +# whether or not a 'hp:/...' print queue exists and exits otherwise, +# see https://bugzilla.novell.com/show_bug.cgi?id=649280 +# hp-systray.wrapper is called via /etc/xdg/autostart/hplip-systray.desktop +# which is changed accordingly in the install section. +Source106: hp-systray.wrapper # Patch100... is for special Suse patches: # Patch101 changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules: Patch101: change-udev-rules.diff @@ -396,6 +402,12 @@ install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/ # to open UDP ports 5353(mdns) and 427(svrloc) for mDNS support: install -d %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/ install -m 644 %{SOURCE105} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/hplip +# Begin "Desktop autostart notification tray stuff": +# Install the wrapper for hp-systray: +install -m 755 %{SOURCE106} %{buildroot}%{_bindir}/hp-systray.wrapper +# Change /etc/xdg/autostart/hplip-systray.desktop to call hp-systray.wrapper: +sed -i -e '/^Exec=hp-systray$/s/hp-systray/hp-systray.wrapper/;' %{buildroot}/etc/xdg/autostart/hplip-systray.desktop +# End of "Desktop autostart notification tray stuff". # Find duplicate files: %fdupes -s %{buildroot} @@ -512,6 +524,7 @@ exit 0 %{_bindir}/hp-toolbox.wrapper %{_datadir}/pixmaps/HPmenu.png %{_datadir}/applications/%{name}.desktop +%{_bindir}/hp-systray.wrapper %{_datadir}/%{name}/ %exclude %{_datadir}/%{name}/data/models/models.dat