Mailinglist Archive: opensuse-commit (869 mails)
| < Previous | Next > |
commit hplip for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 28 Oct 2010 15:11:58 +0200
- Message-id: <20101028131158.B743620238@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package hplip for openSUSE:Factory
checked in at Thu Oct 28 15:11:58 CEST 2010.
--------
--- hplip/hplip.changes 2010-09-15 15:24:41.000000000 +0200
+++ hplip/hplip.changes 2010-10-27 17:08:16.000000000 +0200
@@ -1,0 +2,35 @@
+Wed Oct 27 16:34:11 CEST 2010 - jsmeix@xxxxxxx
+
+- 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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
hplip-3.10.2.tar.bz2
New:
----
hp-systray.wrapper
hplip-3.10.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hplip.spec ++++++
--- /var/tmp/diff_new_pack.9YeAls/_old 2010-10-28 15:09:49.000000000 +0200
+++ /var/tmp/diff_new_pack.9YeAls/_new 2010-10-28 15:09:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hplip (Version 3.10.2)
+# spec file for package hplip (Version 3.10.9)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,13 +29,13 @@
# 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
-Release: 4
+Version: 3.10.9
+Release: 1
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 @@
# 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 @@
# 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 @@
%{_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
++++++ change-udev-rules.diff ++++++
--- /var/tmp/diff_new_pack.9YeAls/_old 2010-10-28 15:09:49.000000000 +0200
+++ /var/tmp/diff_new_pack.9YeAls/_new 2010-10-28 15:09:49.000000000 +0200
@@ -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"
++
++++++ hp-systray.wrapper ++++++
#! /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
++++++ hplip-3.10.2.tar.bz2 -> hplip-3.10.9.tar.bz2 ++++++
hplip/hplip-3.10.2.tar.bz2 hplip/hplip-3.10.9.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |