This commit is contained in:
parent
a73f345216
commit
2f5c179867
@ -2,9 +2,16 @@
|
||||
# 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
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
@ -18,7 +25,7 @@ Summary: HPIJS stand-alone
|
||||
# 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.4
|
||||
Release: 9
|
||||
Release: 30
|
||||
Group: Hardware/Printing
|
||||
License: BSD 3-Clause
|
||||
Url: http://hpinkjet.sourceforge.net/
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 14 19:05:17 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
- Removed the hplip init script which is obsolete since
|
||||
version 2.8.4 where hpssd is gone and replaced by
|
||||
hp-systray, see Novell/Suse Bugzilla bnc#390663.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 29 12:21:17 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
|
42
hplip.spec
42
hplip.spec
@ -2,9 +2,16 @@
|
||||
# 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
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
@ -18,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: 2.8.4
|
||||
Release: 13
|
||||
Release: 56
|
||||
Group: Hardware/Printing
|
||||
License: BSD 3-Clause; GPL v2 or later; X11/MIT
|
||||
Url: http://hpinkjet.sourceforge.net/
|
||||
@ -42,13 +49,11 @@ Source100: %{name}.desktop
|
||||
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:
|
||||
# Source103 was the init script for hpssd which is obsolete since version 2.8.4
|
||||
# where hpssd is gone and replaced by hp-systray, see
|
||||
# https://bugzilla.novell.com/show_bug.cgi?id=390663
|
||||
# Source104 is a 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 mode from "0666" to "0664"
|
||||
@ -309,11 +314,6 @@ rm %{buildroot}%{_datadir}/applications/%{name}*.desktop
|
||||
# Install the man page for /usr/bin/hpijs:
|
||||
install -d %{buildroot}%{_mandir}/man1
|
||||
install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/
|
||||
# Install the init script for hpssd and the usual 'rc'-link to it:
|
||||
install -d %{buildroot}%{_initrddir}
|
||||
install -m 755 %{SOURCE103} %{buildroot}%{_initrddir}/hplip
|
||||
install -d %{buildroot}%{_sbindir}
|
||||
ln -s ../..%{_initrddir}/hplip %{buildroot}%{_sbindir}/rchplip
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
@ -332,7 +332,6 @@ fi
|
||||
exit 0
|
||||
|
||||
%preun
|
||||
%stop_on_removal hplip
|
||||
# If the package was removed and if it was updated
|
||||
# remove all byte-compiled Python .pyc (and perhaps .pyo) files
|
||||
# which are created at run-time by Python in /usr/share/hplip/.
|
||||
@ -347,11 +346,6 @@ 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)
|
||||
# then remove the hpaio lines in /etc/sane.d/dll.conf.
|
||||
# Don't remove them when the hplip package was automatically
|
||||
@ -391,8 +385,6 @@ exit 0
|
||||
%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}/
|
||||
%{_bindir}/hp-align
|
||||
%{_bindir}/hp-check
|
||||
@ -444,6 +436,10 @@ exit 0
|
||||
%{_libdir}/libhpmud.*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 14 2008 jsmeix@suse.de
|
||||
- Removed the hplip init script which is obsolete since
|
||||
version 2.8.4 where hpssd is gone and replaced by
|
||||
hp-systray, see Novell/Suse Bugzilla bnc#390663.
|
||||
* Tue Apr 29 2008 jsmeix@suse.de
|
||||
- Added RPM requirement for python-gobject2 because the dbus stuff
|
||||
in HPLIP requires the Python module gobject but there is no
|
||||
|
101
rchplip
101
rchplip
@ -1,101 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: hplip
|
||||
# Required-Start:
|
||||
# Required-Stop:
|
||||
# Should-Start:
|
||||
# Should-Stop:
|
||||
# Default-Start:
|
||||
# Default-Stop:
|
||||
# Short-Description: Since HPLIP 2.8.4 hpssd is gone. Stop it in any case.
|
||||
# Description: Stop hpssd from HP Linux Imaging and Printing (HPLIP)
|
||||
### END INIT INFO
|
||||
|
||||
RUNDIR=/var/run
|
||||
|
||||
if [ -f /etc/init.d/functions ] ; then
|
||||
. /etc/init.d/functions
|
||||
else
|
||||
|
||||
export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
|
||||
export LC_ALL="POSIX"
|
||||
export LANG="POSIX"
|
||||
export HOME="/tmp"
|
||||
umask 022
|
||||
|
||||
killproc() {
|
||||
pid=`pidof -s $1`
|
||||
pidfile=$RUNDIR/${1}.pid
|
||||
if [ -z $pid ]; then
|
||||
if [ -f $pidfile ]; then
|
||||
read pid < $pidfile
|
||||
kill $pid
|
||||
fi
|
||||
else
|
||||
kill $pid
|
||||
fi
|
||||
retval=$?
|
||||
if [ -f $pidfile ]; then
|
||||
rm $pidfile
|
||||
fi
|
||||
if [ $retval -eq 0 ]; then
|
||||
echo -ne " [ OK ]\r"
|
||||
else
|
||||
echo -ne " [FAILED]\r"
|
||||
fi
|
||||
}
|
||||
|
||||
fi
|
||||
|
||||
|
||||
RETVAL=0
|
||||
|
||||
stop() {
|
||||
echo -n $"Since HPLIP 2.8.4 hpssd is gone. Stopping it in any case: "
|
||||
killproc hpssd
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/hplip
|
||||
for pidfile in $RUNDIR/*; do
|
||||
case "$( basename $pidfile )" in
|
||||
hpguid-*.pid)
|
||||
read pid < $pidfile
|
||||
kill $pid
|
||||
rm $pidfile
|
||||
esac
|
||||
done
|
||||
if [ ! -f /var/lock/subsys/hplip ]; then
|
||||
rm -f /var/lock/subsys/hplip
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
stop
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
status)
|
||||
stop
|
||||
;;
|
||||
restart)
|
||||
stop
|
||||
;;
|
||||
try-restart)
|
||||
stop
|
||||
;;
|
||||
force-reload)
|
||||
stop
|
||||
;;
|
||||
debug)
|
||||
stop
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $?
|
Loading…
x
Reference in New Issue
Block a user