SPECS: hplip.spec - Release 2 - missing BuildReq and Req - daemon ...

[pascalek]

Author: pascalek                     Date: Mon Mar 26 18:02:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Release 2
- missing BuildReq and Req
- daemon and gui-tools packages
- some missing %%files
- new TODO list

---- Files affected:
SPECS:
   hplip.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/hplip.spec
diff -u SPECS/hplip.spec:1.24 SPECS/hplip.spec:1.25
--- SPECS/hplip.spec:1.24	Mon Mar 26 17:55:49 2007
+++ SPECS/hplip.spec	Mon Mar 26 20:02:15 2007
@@ -1,10 +1,14 @@
 # $Revision$, $Date$
 # TODO:
-#       - add desktop file for toolbox
-#       - GUI tools require python-qt, they should be separated to a subpackage
-#         (the rest of package works without Qt)
-#       - check if symlinks /usr/lib/sane/libsane-hpaio.so.1 -> ../libsane-hpaio.so.1.0.0
-#         are "right way" of making them available to sane.
+#	- add desktop file for toolbox
+#	- check if all GUI tools were separated
+#	- check for all files required by daemon package (or Reqs)
+#	- prepare fax packages for fax utilities
+#	- check if symlinks /usr/lib/sane/libsane-hpaio.so.1 -> ../libsane-hpaio.so.1.0.0
+#	  are "right way" of making them available to sane.
+#	- separate package for hpijs (hplip Req: hpijs, hplip-hpijs Prov: hpijs?)
+#	- hp-checks looks for installer module (unpackaged files?)
+#
 # Conditional build:
 %bcond_without	cups	# without CUPS support
 #
@@ -12,7 +16,7 @@
 Summary(pl.UTF-8):	Serwer dla drukarek HP Inkjet
 Name:		hplip
 Version:	1.7.3
-Release:	1
+Release:	2
 License:	BSD, GPL v2 and MIT
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/hplip/%{name}-%{version}.tar.gz
@@ -30,8 +34,10 @@
 BuildRequires:	openssl-devel
 BuildRequires:	python-devel
 BuildRequires:	python-modules
+BuildRequires:	rpm-pythonprov
 BuildRequires:	sane-backends-devel
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	python-modules
 Obsoletes:	hpijs
 Obsoletes:	python-hplip
 Conflicts:	ghostscript <= 7.00-3
@@ -51,6 +57,31 @@
 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
+Group:		Applications/System
+Requires:	python-PyQt
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description gui-tools
+HPLIP GUI tools.
+
+%description gui-tools -l pl.UTF-8
+Narzędzia graficzne HPLIP.
+
 %package libs
 Summary:	HPLIP Libraries
 Summary(pl.UTF-8):	Biblioteki HPLIP
@@ -68,7 +99,7 @@
 Group:		Libraries
 Requires(post):	/bin/grep
 Requires(postun):	/bin/sed
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description sane
 HPLIP SANE Libraries.
@@ -139,8 +170,8 @@
 ln -sf %{_datadir}/%{name}/hpssd.py $RPM_BUILD_ROOT%{_sbindir}/hpssd
 ln -sf %{_datadir}/%{name}/setup $RPM_BUILD_ROOT%{_sbindir}/hp-setup
 
-for tool in align clean colorcal fab info levels makeuri photo print \
-		sendfax testpage toolbox unload ; do
+for tool in align clean check colorcal fab firmware info levels makecopies makeuri print \
+		probe sendfax setup testpage timedate toolbox unload ; do
 	ln -sf %{_datadir}/%{name}/$tool $RPM_BUILD_ROOT%{_bindir}/hp-$tool
 done
 
@@ -148,11 +179,22 @@
 
 mv $RPM_BUILD_ROOT{%{_datadir}/%{name}/%{name}.conf,%{_sysconfdir}/hp}
 rm -rf $RPM_BUILD_ROOT{%{_bindir}/foomatic-rip,%{_libdir}/*.la,%{_docdir}/hpijs*} \
-	$RPM_BUILD_ROOT{%{_datadir}/%{name}/hplip{,.sh},%{_sysconfdir}/sane.d/*}
+	$RPM_BUILD_ROOT{%{_datadir}/%{name}/hplip{,.sh},%{_sysconfdir}/sane.d/*} \
+	$RPM_BUILD_ROOT/etc/init.d
 
 %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
 
@@ -167,9 +209,23 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/*
-%attr(755,root,root) %{_bindir}/hp*
-%attr(755,root,root) %{_sbindir}/hp*
-%attr(754,root,root) /etc/rc.d/init.d/hplip
+%attr(755,root,root) %{_bindir}/hpijs
+%attr(755,root,root) %{_bindir}/hp-align
+%attr(755,root,root) %{_bindir}/hp-clean
+%attr(755,root,root) %{_bindir}/hp-check
+%attr(755,root,root) %{_bindir}/hp-colorcal
+%attr(755,root,root) %{_bindir}/hp-firmware
+%attr(755,root,root) %{_bindir}/hp-info
+%attr(755,root,root) %{_bindir}/hp-levels
+%attr(755,root,root) %{_bindir}/hp-makecopies
+%attr(755,root,root) %{_bindir}/hp-makeuri
+%attr(755,root,root) %{_bindir}/hp-print
+%attr(755,root,root) %{_bindir}/hp-probe
+%attr(755,root,root) %{_bindir}/hp-sendfax
+%attr(755,root,root) %{_bindir}/hp-setup
+%attr(755,root,root) %{_bindir}/hp-testpage
+%attr(755,root,root) %{_bindir}/hp-timedate
+%attr(755,root,root) %{_bindir}/hp-unload
 %dir %{_datadir}/hplip
 # info about GPL v2 for some files
 %{_datadir}/hplip/COPYING
@@ -185,17 +241,17 @@
 %attr(755,root,root) %{_datadir}/hplip/check
 %attr(755,root,root) %{_datadir}/hplip/clean
 %attr(755,root,root) %{_datadir}/hplip/colorcal
-%attr(755,root,root) %{_datadir}/hplip/fab
-%attr(755,root,root) %{_datadir}/hplip/hpssd.py
+%attr(755,root,root) %{_datadir}/hplip/firmware
 %attr(755,root,root) %{_datadir}/hplip/info
 %attr(755,root,root) %{_datadir}/hplip/levels
 %attr(755,root,root) %{_datadir}/hplip/makeuri
 %attr(755,root,root) %{_datadir}/hplip/makecopies
 %attr(755,root,root) %{_datadir}/hplip/print
+%attr(755,root,root) %{_datadir}/hplip/probe
 %attr(755,root,root) %{_datadir}/hplip/sendfax
 %attr(755,root,root) %{_datadir}/hplip/setup
 %attr(755,root,root) %{_datadir}/hplip/testpage
-%attr(755,root,root) %{_datadir}/hplip/toolbox
+%attr(755,root,root) %{_datadir}/hplip/timedate
 %attr(755,root,root) %{_datadir}/hplip/unload
 %{_datadir}/hplip/base
 # need look
@@ -211,6 +267,19 @@
 %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)
+%attr(755,root,root) %{_bindir}/hp-fab
+%attr(755,root,root) %{_bindir}/hp-toolbox
+%attr(755,root,root) %{_datadir}/hplip/fab
+%attr(755,root,root) %{_datadir}/hplip/toolbox
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libhpip*.so.*
@@ -237,6 +306,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2007/03/26 18:02:15  pascalek
+- Release 2
+- missing BuildReq and Req
+- daemon and gui-tools packages
+- some missing %%files
+- new TODO list
+
 Revision 1.24  2007/03/26 15:55:49  pascalek
 - updated to 1.7.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hplip.spec?r1=1.24&r2=1.25&f=u