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

hpijs-standalone.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr  3 16:27:33 CEST 2008 - jsmeix@suse.de
+
+- Updated to version 2.8.4:
+  One more supported LaserJet ZJStream printers (M1120),
+  one OfficeJet (J6400), and two Photosmart (C4340, B8800)
+  where the latter has a new printer device class (PSB9100).
+
 -------------------------------------------------------------------
 Thu Feb 21 14:57:24 CET 2008 - jsmeix@suse.de
 

hpijs-standalone.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package hpijs-standalone (Version 2.8.2)
+# spec file for package hpijs-standalone (Version 2.8.4)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,18 +12,18 @@
 
 
 Name:           hpijs-standalone
-BuildRequires:  gcc-c++ libjpeg-devel
+BuildRequires:  gcc-c++ libjpeg-devel pkgconfig
 Summary:        HPIJS stand-alone
 # 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:        2.8.2
+Version:        2.8.4
-Release:        12
+Release:        1
 Group:          Hardware/Printing
 License:        BSD 3-Clause
 Url:            http://hpinkjet.sourceforge.net/
 # Source0...Source9 is for sources from HP:
-# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-2.8.2.tar.gz
+# URL for Source0: http://puzzle.dl.sourceforge.net/sourceforge/hplip/hplip-2.8.4.tar.gz
 Source0:        hplip-%{version}.tar.bz2
 # Patch10...Patch99 is for Suse patches for the sources from HP:
 # The patch numbers are the same as in hplip.spec.
@@ -115,6 +115,11 @@ exit 0
 %{_bindir}/hpijs
 
 %changelog
+* Thu Apr 03 2008 jsmeix@suse.de
+- Updated to version 2.8.4:
+  One more supported LaserJet ZJStream printers (M1120),
+  one OfficeJet (J6400), and two Photosmart (C4340, B8800)
+  where the latter has a new printer device class (PSB9100).
 * Thu Feb 21 2008 jsmeix@suse.de
 - Updated to version 2.8.2:
   Updated the krgb patch for gpl ghostscript 8.61.

hplip-2.8.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f36420e3b2491606b2a11b6fea2e256419b00a198cc115d6011e939336506536
-size 12663920

hplip-2.8.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfa5447bc5bd95f0673a7d4c49230a8578d31e44e536813f8c83d65ef810e4e8
+size 13122844

hplip.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Apr  3 15:59:09 CEST 2008 - jsmeix@suse.de
+
+- Updated to version 2.8.4:
+  Elimination of all persistent startup daemons.
+  The last daemon hpssd has been replaced with hp-systray.
+  All interprocess communication uses now dbus.
+  Therefore dbus-1-python version 0.80 or greater is required.
+  PC send fax requires dbus and a running hp-systray to operate
+  but hp-toolbox and hp-sendfax launch hp-systray automatically
+  and there is also /etc/xdg/autostart/hplip-systray.desktop.
+  When no HPLIP tools are running (e.g. hp-toolbox),
+  and the user closes or disables hp-systray, 
+  there will be no HPLIP processes running whatsoever.
+  Many bug fixes (no Suse bugs).
+  One more supported LaserJet ZJStream printers (M1120),
+  one OfficeJet (J6400), and two Photosmart (C4340, B8800)
+  where the latter has a new printer device class (PSB9100).
+  For details see release_notes.html
+- Adapted the hplip init script to provide backward compatibility:
+  It still exists to avoid that printer/scanner setup tools fail 
+  when they try to enable the "hplip" service but all it does
+  is to stop a possibly running hpssd.
+
 -------------------------------------------------------------------
 Wed Apr  2 14:40:57 CEST 2008 - jsmeix@suse.de
 

hplip.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package hplip (Version 2.8.2)
+# spec file for package hplip (Version 2.8.4)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,18 +12,18 @@
 
 
 Name:           hplip
-BuildRequires:  cups cups-devel libdrm-devel libgphoto2-devel libjpeg-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt python-tk python-xml qt3-devel readline-devel sane-backends update-desktop-files
+BuildRequires:  cups cups-devel dbus-1-devel libdrm-devel libgphoto2-devel libjpeg-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt python-tk python-xml qt3-devel readline-devel sane-backends update-desktop-files
 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:        2.8.2
+Version:        2.8.4
-Release:        23
+Release:        1
 Group:          Hardware/Printing
 License:        BSD 3-Clause; GPL v2 or later; X11/MIT
 Url:            http://hpinkjet.sourceforge.net/
 # Source0...Source9 is for sources from HP:
-# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-2.8.2.tar.gz
+# URL for Source0: http://puzzle.dl.sourceforge.net/sourceforge/hplip/hplip-2.8.4.tar.gz
 Source0:        %{name}-%{version}.tar.bz2
 # Patch0...Patch9 is for patches from HP:
 # Patch10...Patch99 is for Suse patches for the sources from HP:
@@ -39,12 +39,17 @@ Source101:      hp-toolbox.wrapper
 # Source102 is a small man page for /usr/bin/hpijs:
 Source102:      hpijs.1.gz
 # Source103 is the init script for hpssd:
+# Since version 2.8.4 hpssd is gone and replaced by hp-systray.
+# Therefore the init script does now stop hpssd regardless how it is called
+# and exit successfully in any case to provide backward compatibility and in particular
+# to avoid that printer/scanner setup tools fail when they try to enable the "hplip" service.
 Source103:      rchplip
 # Script which outputs a global HAL fdi file for all HP USB devices which belong to HPLIP:
 Source104:      create_hal_global_fdi_from_hpmud_rules
 # Patch100... is for special Suse patches:
-# Patch101 changes in the udev rules file the owner from "lp" to "root"
+# Patch101 changes in the udev rules file the mode from "0666" to "0664"
-# to avoid that the permissions can be changed e.g. by any CUPS filter script
+# and for parallel port devices the owner from "lp" to "root" to avoid
+# that the permissions can be changed e.g. by any CUPS filter script
 # or CUPS backend (both run as user "lp"):
 Patch101:       change-udev-rules.diff
 # Install into this non-root directory (required when norootforbuild is used):
@@ -55,7 +60,12 @@ PreReq:         coreutils, /bin/grep, /bin/sed, /usr/bin/find
 # A wrong library version may let libsane-hpaio crash (e.g. segfault)
 # which lets the whole scanning stack frontend<->libsane-dll<->libsane-backend crash
 # also for any other backend when the hpaio backend is enabled (e.g. "scanimage -L"):
-Requires:       %{name}-hpijs = %{version}, foomatic-filters, python-xml, python-qt, pyxml
+Requires:       %{name}-hpijs = %{version}-%{release}
+# Require special Python stuff (which pulls in Python base stuff):
+Requires:       python-xml, python-qt, pyxml
+# Since version 2.8.4 all interprocess communication uses dbus.
+# Therefore python-dbus version 0.80 or greater is required (which pulls in dbus base stuff):
+Requires:       dbus-1-python >= 0.80
 # Either the hplip17 packages or the hplip packages can be installed:
 Obsoletes:      hplip17
 # Skip testing devel dependencies required by libtool .la files by the following comment:
@@ -178,7 +188,8 @@ Authors:
 %setup -q
 # Fix "... is used uninitialized ..." warnings:
 %patch10
-# Patch101 changes in the udev rules file the owner from "lp" to "root":
+# Patch101 changes in the udev rules file the mode from "0666" to "0664"
+# and for parallel port devices the owner from "lp" to "root":
 %patch101
 
 %build
@@ -277,13 +288,14 @@ install -m644 70-hpmud.fdi %{buildroot}%{_sysconfdir}/hal/fdi/policy/10osvendor/
 # Desktop menue entry stuff:
 # Install the wrapper for hp-toolbox:
 install -m 755 %{SOURCE101} %{buildroot}%{_bindir}/hp-toolbox.wrapper
-# Install /usr/share/hplip/data/images/HPmenu.png as desktop icon file:
+# Install /usr/share/hplip/data/images/48x48/prog.png as desktop icon file
+# because it is used in the hplip.desktop.in and hplip-systray.desktop.in sources:
 install -d %{buildroot}%{_datadir}/pixmaps
-install -m 644 %{buildroot}%{_datadir}/%{name}/data/images/HPmenu.png %{buildroot}%{_datadir}/pixmaps/HPmenu.png
+install -m 644 %{buildroot}%{_datadir}/%{name}/data/images/48x48/prog.png %{buildroot}%{_datadir}/pixmaps/HPmenu.png
 # Set up and install the desktop menue entry stuff using "Categories=System;Monitor;"
-# and remove HP's hplip.desktop file before because we use Source100:
+# and remove HP's hplip.desktop and hplip-systray.desktop files before because we use Source100:
-# (additionally there is a typo in HP's install because of the trailing blank at 'applications ')
+# (additionally there is/was a typo in HP's install because of the trailing blank at 'applications ')
-rm %{buildroot}%{_datadir}/applications/%{name}.desktop
+rm %{buildroot}%{_datadir}/applications/%{name}*.desktop
 %suse_update_desktop_file -i %{name} System Monitor
 # Install the man page for /usr/bin/hpijs:
 install -d %{buildroot}%{_mandir}/man1
@@ -326,6 +338,9 @@ exit 0
 
 %postun
 /sbin/ldconfig
+# Since version 2.8.4 hpssd is gone and replaced by hp-systray.
+# Therefore the init script does now stop hpssd regardless how it is called
+# and exit successfully in any case to provide backward compatibility:
 %restart_on_update hplip
 %insserv_cleanup
 # If the package was removed (but not if it was updated)
@@ -366,6 +381,7 @@ exit 0
 %dir %{_sysconfdir}/hal/fdi/policy
 %dir %{_sysconfdir}/hal/fdi/policy/10osvendor
 %{_sysconfdir}/hal/fdi/policy/10osvendor/70-hpmud.fdi
+%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_initrddir}/hplip
 %{_sbindir}/rchplip
 %{_datadir}/%{name}/
@@ -384,6 +400,7 @@ exit 0
 %{_bindir}/hp-scan
 %{_bindir}/hp-sendfax
 %{_bindir}/hp-setup
+%{_bindir}/hp-systray
 %{_bindir}/hp-testpage
 %{_bindir}/hp-timedate
 %{_bindir}/hp-toolbox
@@ -418,6 +435,27 @@ exit 0
 %{_libdir}/libhpmud.*
 
 %changelog
+* Thu Apr 03 2008 jsmeix@suse.de
+- Updated to version 2.8.4:
+  Elimination of all persistent startup daemons.
+  The last daemon hpssd has been replaced with hp-systray.
+  All interprocess communication uses now dbus.
+  Therefore dbus-1-python version 0.80 or greater is required.
+  PC send fax requires dbus and a running hp-systray to operate
+  but hp-toolbox and hp-sendfax launch hp-systray automatically
+  and there is also /etc/xdg/autostart/hplip-systray.desktop.
+  When no HPLIP tools are running (e.g. hp-toolbox),
+  and the user closes or disables hp-systray,
+  there will be no HPLIP processes running whatsoever.
+  Many bug fixes (no Suse bugs).
+  One more supported LaserJet ZJStream printers (M1120),
+  one OfficeJet (J6400), and two Photosmart (C4340, B8800)
+  where the latter has a new printer device class (PSB9100).
+  For details see release_notes.html
+- Adapted the hplip init script to provide backward compatibility:
+  It still exists to avoid that printer/scanner setup tools fail
+  when they try to enable the "hplip" service but all it does
+  is to stop a possibly running hpssd.
 * Wed Apr 02 2008 jsmeix@suse.de
 - Exchanged create_hal_global_fdi_from_models.dat with
   create_hal_global_fdi_from_hpmud_rules which creates the

rchplip

@@ -1,33 +1,17 @@
 #! /bin/bash
-#
+
-# Startup/shutdown script for HPLIP 
-#
-# Note, this script file must start before cupsd.
-#
-# For chkconfig the HPLIP priority (ie: 50) must be less the cupsd 
-# priority (ie: 55).
-#
-# For LSB install_initd the cups script file should have "hplip" in the
-# Should-Start field.
-# 
-#   chkconfig: 2345 50 10
-#   description: Start/stop script for HP Linux Imaging and Printing (HPLIP).
-#
-# (c) 2004 Copyright Hewlett-Packard Development Company, LP
-#
 ### BEGIN INIT INFO
 # Provides: hplip
-# Required-Start: $local_fs $remote_fs $syslog
+# Required-Start:
 # Required-Stop:
 # Should-Start:
 # Should-Stop:
-# Default-Start: 3 5
+# Default-Start:
 # Default-Stop:
-# Short-Description: Start/stop hpssd
+# Short-Description: Since HPLIP 2.8.4 hpssd is gone. Stop it in any case.
-# Description: Start/stop script for hpssd from HP Linux Imaging and Printing (HPLIP)
+# Description: Stop hpssd from HP Linux Imaging and Printing (HPLIP)
 ### END INIT INFO
 
-HPSSDDIR=/usr/share/hplip
 RUNDIR=/var/run
 
 if [ -f /etc/init.d/functions ] ; then
@@ -40,15 +24,6 @@ export LANG="POSIX"
 export HOME="/tmp"
 umask 022
 
-daemon() {
-   ( exec -a hpssd python /usr/share/hplip/hpssd.py >/dev/null 2>&1 )
-   if [ $? -eq 0 ]; then
-      echo -ne "                                           [  OK  ]\r"
-   else
-      echo -ne "                                           [FAILED]\r"
-   fi
-}
-
 killproc() {
    pid=`pidof -s $1`
    pidfile=$RUNDIR/${1}.pid
@@ -73,41 +48,11 @@ killproc() {
 
 fi 
 
-mystatus() {
-   pid=`pidof -s $1`
-   if [ -z $pid ]; then
-      pidfile=$RUNDIR/${1}.pid
-      if [ -f $pidfile ]; then
-         read pid < $pidfile
-      fi      
-   fi
-
-   if [ -n "$pid" ]; then
-      echo $"$1 (pid $pid) is running..."
-      return 0
-   fi
-
-   echo $"$1 is stopped"
-   return 3
-}
 
 RETVAL=0
 
-start() {
-        echo -n $"Starting hpssd: "
-        cd $HPSSDDIR
-        daemon ./hpssd.py
-        RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && [ -d /var/lock/subsys ] && touch /var/lock/subsys/hplip
-        if [ -f /var/lock/subsys/hplip ]; then
-           touch /var/lock/subsys/hplip
-        fi
-        return $RETVAL
-}
-
 stop() {
-        echo -n $"Stopping hpssd: "
+        echo -n $"Since HPLIP 2.8.4 hpssd is gone. Stopping it in any case: "
         killproc hpssd
         RETVAL=$?
         echo
@@ -123,59 +68,30 @@ stop() {
         if [ ! -f /var/lock/subsys/hplip ]; then
         	rm -f /var/lock/subsys/hplip
         fi
-        return $RETVAL
+        return 0
 }       
 
-restart() {
-        stop
-        start
-}       
-
-debug() {
-        # Allow core dumps.
-        ulimit -c unlimited
-
-        echo -n $"Starting hpssd: "
-        cd $HPSSDDIR
-        ./hpssd.py >/dev/null 2>&1
-        RETVAL=$?
-        if [ $RETVAL -eq 0 ]; then
-           echo -ne "                                           [  OK  ]\r"
-        else
-           echo -ne "                                           [FAILED]\r"
-        fi
-        echo
-        [ $RETVAL = 0 ] && [ -d /var/lock/subsys ] && touch /var/lock/subsys/hplip
-        if [ -f /var/lock/subsys/hplip ]; then
-           touch /var/lock/subsys/hplip
-           return 0
-        else
-           return 1
-	fi
-}
-
 case "$1" in
   start)
-        start
+        stop
         ;;
   stop)
         stop
         ;;
   status)
-        mystatus hpssd
+        stop
         ;;
   restart)
-        restart
+        stop
         ;;
   try-restart)
-        ## Restart the service only if it was running before:
+        stop
-        mystatus hpssd &>/dev/null && restart  || :
         ;;
   force-reload)
-        restart
+        stop
         ;;
   debug)
-        debug
+        stop
         ;;
   *)
         echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"