From 6336a75a6f5bc04974792978be78d83d9746871e Mon Sep 17 00:00:00 2001 From: pascalek Date: Mon, 26 Mar 2007 18:02:15 +0000 Subject: [PATCH] - Release 2 - missing BuildReq and Req - daemon and gui-tools packages - some missing %%files - new TODO list Changed files: hplip.spec -> 1.25 --- hplip.spec | 103 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 17 deletions(-) diff --git a/hplip.spec b/hplip.spec index e996322..8278105 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,9 +1,13 @@ # 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 # @@ -11,7 +15,7 @@ Summary: Hewlett-Packard Linux Imaging and Printing Project 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 @@ -29,8 +33,10 @@ BuildRequires: net-snmp-devel 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 @@ -50,6 +56,31 @@ Linux. The goal of this project is to provide "radically simple" 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 @@ -67,7 +98,7 @@ Summary(pl.UTF-8): Biblioteki HPLIP SANE Group: Libraries Requires(post): /bin/grep Requires(postun): /bin/sed -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description sane HPLIP SANE Libraries. @@ -138,8 +169,8 @@ mv $RPM_BUILD_ROOT{%{_datadir}/ppd/HP/*,%{_cupsppddir}} 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 @@ -147,11 +178,22 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/hplip 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 @@ -166,9 +208,23 @@ fi %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 @@ -184,17 +240,17 @@ fi %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 @@ -210,6 +266,19 @@ fi %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.* -- 2.44.0