SPECS: hplip.spec - removed package -daemon (no more start-up daem...

[sls]

Author: sls                          Date: Fri Nov 16 05:33:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed package -daemon (no more start-up daemons since 2.7.6)

---- Files affected:
SPECS:
   hplip.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/hplip.spec
diff -u SPECS/hplip.spec:1.34 SPECS/hplip.spec:1.35
--- SPECS/hplip.spec:1.34	Fri Nov 16 05:58:33 2007
+++ SPECS/hplip.spec	Fri Nov 16 06:32:56 2007
@@ -14,6 +14,7 @@
 #		   /usr/lib/python2.5/site-packages/pcardext.la
 #		   /usr/lib/python2.5/site-packages/scanext.la
 #		   /usr/share/applications/hplip.desktop
+#	- it would be good to kill "python /usr/share/hplip/hpssd.py" during upgrade/uninstall
 #
 # Conditional build:
 %bcond_without	cups	# without CUPS support
@@ -22,7 +23,7 @@
 Summary(pl.UTF-8):	Serwer dla drukarek HP Inkjet
 Name:		hplip
 Version:	2.7.10
-Release:	0.2
+Release:	0.3
 License:	BSD, GPL v2 and MIT
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/hplip/%{name}-%{version}.tar.gz
@@ -44,6 +45,7 @@
 BuildRequires:	sane-backends-devel
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	python-modules
+Obsoletes:	hplip-daemon
 Obsoletes:	hpijs
 Obsoletes:	python-hplip
 Conflicts:	ghostscript <= 7.00-3
@@ -65,18 +67,6 @@
 printing, faxing, scanning, photo-card access, and device management
 to the consumer and small business desktop Linux users.
 
-%package daemon
-Summary:	HPLIP daemon
-Summary(pl.UTF-8):	Server HPLIP
-Group:		Applications/System
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description daemon
-HPLIP daemon.
-
-%description daemon -l pl.UTF-8
-Server HPLIP.
-
 %package gui-tools
 Summary:	HPLIP GUI tools
 Summary(pl.UTF-8):	Narzędzia graficzne HPLIP
@@ -211,16 +201,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post daemon
-/sbin/chkconfig --add hplip
-%service hplip restart "HPLIP daemons"
-
-%preun daemon
-if [ "$1" = "0" ]; then
-	%service hplip stop
-	/sbin/chkconfig --del hplip
-fi
-
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -269,6 +249,7 @@
 %attr(755,root,root) %{_datadir}/hplip/clean.py
 %attr(755,root,root) %{_datadir}/hplip/colorcal.py
 %attr(755,root,root) %{_datadir}/hplip/firmware.py
+%attr(755,root,root) %{_datadir}/hplip/hpssd.py
 %attr(755,root,root) %{_datadir}/hplip/info.py
 %attr(755,root,root) %{_datadir}/hplip/levels.py
 %attr(755,root,root) %{_datadir}/hplip/makeuri.py
@@ -297,11 +278,6 @@
 %dir %{_sysconfdir}/hp
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hp/*
 
-%files daemon
-%defattr(644,root,root,755)
-#%attr(755,root,root) %{_sbindir}/hp*
-%attr(754,root,root) /etc/rc.d/init.d/hplip
-%attr(755,root,root) %{_datadir}/hplip/hpssd.py
 
 %files gui-tools
 %defattr(644,root,root,755)
@@ -341,6 +317,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2007-11-16 05:32:56  sls
+- removed package -daemon (no more start-up daemons since 2.7.6)
+
 Revision 1.34  2007-11-16 04:58:33  sls
 - Suggests python-ReportLab >= 2.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/hplip.spec?r1=1.34&r2=1.35&f=u