Accepting request 157493 from Printing

Removed hp-systray.wrapper to be in compliance with HPLIP upstream (bnc#649280 starting at comment#10)

OBS-URL: https://build.opensuse.org/request/show/157493
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=79

hp-systray.wrapper

@@ -1,17 +0,0 @@
-#! /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.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  6 09:41:02 CET 2013 - jsmeix@suse.de
+
+- Removed hp-systray.wrapper because the reason for it
+  is no longer in compliance with HPLIP upstream intentions
+  (see SUSE Bugzilla bnc#649280 starting at comment#10).
+
 -------------------------------------------------------------------
 Fri Feb 15 15:31:28 CET 2013 - jsmeix@suse.de
 

hplip.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           hplip
 # BuildRequires foomatic-filters to avoid /usr/lib/rpm/brp-symlink ERROR:
 # link target doesn't exist (neither in build root nor in installed system):
@@ -95,12 +94,8 @@ Source102:      hpijs.1.gz
 # (compare also Novell/Suse Bugzilla bnc#498429)
 # hplip.SuSEfirewall2 is no longer provided
 # see https://bugzilla.novell.com/show_bug.cgi?id=757354#c10
-# Source106 is a wrapper for hp-systray which tests via "lpstat"
+# Source106 hp-systray.wrapper was a wrapper for hp-systray which is no longer needed
-# 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
@@ -423,7 +418,7 @@ rm %{buildroot}%{_sysconfdir}/sane.d/dll.conf
 rm %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 # Remove the outdated "Check and add printer for Suse 10.3 distro" udev rule
 # and let the build fail if it does no longer match to notify about the change:
-grep 'for Suse 10.3 distro' %{buildroot}%{_sysconfdir}/udev/rules.d/56-hpmud_add_printer.rules || exit 1
+grep 'for Suse 10.3 distro' %{buildroot}%{_sysconfdir}/udev/rules.d/56-hpmud_add_printer.rules || exit 99
 sed -i -e '/for Suse 10.3 distro/,+1 d' %{buildroot}%{_sysconfdir}/udev/rules.d/56-hpmud_add_printer.rules
 # Begin "General tests and adjustments for all PPDs" (see manufacturer-PPDs.spec):
 pushd %{buildroot}%{_datadir}/cups/model/manufacturer-PPDs/%{name}
@@ -507,12 +502,6 @@ rm %{buildroot}%{_datadir}/applications/hplip*.desktop
 # Install the man page for /usr/bin/hpijs:
 install -d %{buildroot}%{_mandir}/man1
 install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/
-# 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".
 # Run fdupes:
 # The RPM macro fdupes runs /usr/bin/fdupes that links files with identical content.
 # Never run fdupes carelessly over the whole buildroot directory
@@ -650,7 +639,6 @@ exit 0
 %doc %{_defaultdocdir}/%{name}/
 %{_datadir}/icons/hicolor/*/apps/HPmenu.png
 %{_datadir}/applications/%{name}.desktop
-%{_bindir}/hp-systray.wrapper
 %{_datadir}/hplip/
 %exclude %{_datadir}/hplip/data/models/models.dat