SPECS (AC-branch): hplip.spec - version 2.8.10, merged from HEAD - fax subp...

marcus marcus at pld-linux.org
Fri Nov 28 21:53:58 CET 2008 

Author: marcus                       Date: Fri Nov 28 20:53:58 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- version 2.8.10, merged from HEAD
- fax subpackage disabled (need hal, which is too old in Ac)

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

---- Diffs:

================================================================
Index: SPECS/hplip.spec
diff -u SPECS/hplip.spec:1.25 SPECS/hplip.spec:1.25.2.1
--- SPECS/hplip.spec:1.25	Mon Mar 26 20:02:15 2007
+++ SPECS/hplip.spec	Fri Nov 28 21:53:52 2008
@@ -1,32 +1,25 @@
 # $Revision$, $Date$
 # TODO:
 #	- 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
+#	- separate udev files
+#	- it would be good to kill "python /usr/share/hplip/hpssd.py" during upgrade/uninstall
 #
 Summary:	Hewlett-Packard Linux Imaging and Printing Project
 Summary(pl.UTF-8):	Serwer dla drukarek HP Inkjet
 Name:		hplip
-Version:	1.7.3
-Release:	2
+Version:	2.8.10
+Release:	1
 License:	BSD, GPL v2 and MIT
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/hplip/%{name}-%{version}.tar.gz
-# Source0-md5:	6921d256c9efc37446f5d2fad71979f8
-Source1:	%{name}.init
-Source2:	%{name}-DJ670C.xml
+# Source0-md5:	a9ad78c4f0d884caac6b176b3cb9bf21
+Patch0:		%{name}-ui-optional.patch
 URL:		http://hplip.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_cups:BuildRequires:	cups-devel}
+BuildRequires:	cups-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libusb-devel
@@ -38,17 +31,18 @@
 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
+# used in scan.py
+Suggests:	python-ReportLab >= 2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _ulibdir        %{_prefix}/lib
 
-%if %{with cups}
 %define 	_cupsdir 	%(cups-config --datadir)
 %define		_cupsppddir	%{_cupsdir}/model
-%endif
 
 %description
 The Hewlett-Packard Linux Imaging and Printing project (HPLIP)
@@ -57,18 +51,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
@@ -112,6 +94,7 @@
 Summary(pl.UTF-8):	Baza danych PPD dla drukarek Hewlett Packard
 Group:		Applications/System
 Requires:	cups
+Obsoletes:	hpijs-ppd
 
 %description ppd
 PPD database for Hewlett Packard printers.
@@ -132,71 +115,65 @@
 %description -n cups-backend-hp -l pl.UTF-8
 Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach HP.
 
+#%package -n cups-backend-hpfax
+#Summary:	HP fax backend for CUPS
+#Summary(pl):	Backend HP fax dla CUPS-a
+#Group:		Applications/Printing
+#Requires:	%{name} = %{version}-%{release}
+#Requires:	cups
+
+##%description -n cups-backend-hpfax
+#This package allow CUPS faxing using HP AiO devices.
+
+#%description -n cups-backend-hpfax -l pl.UTF-8
+#Ten pakiet umożliwia wysyłanie faksów z poziomu CUPS-a poprzez
+#urządzenia HP AiO.
+
 %prep
 %setup -q
+#%patch0 -p1
 sed -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py
 
 %build
-install %{SOURCE2} data/xml
 install /usr/share/automake/config.* .
 install /usr/share/automake/config.* prnt
 CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti"
 %configure \
-	--enable-foomatic-install \
-	%{!?with_cups:--disable-cups-install}
+	--disable-foomatic-xml-install \
+	--enable-foomatic-ppd-install \
+	--disable-dbus-build \
+	--disable-fax-build
 %{__make} \
-	hpppddir=/usr/share/cups/model \
 	hpppddir=%{_cupsppddir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/hp}
 
-%if %{with cups}
-install -d $RPM_BUILD_ROOT$(cups-config --datadir)/model \
+install -d $RPM_BUILD_ROOT%{_cupsppddir} \
 	$RPM_BUILD_ROOT$(cups-config --serverbin)/filter
-%endif
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	rpm_install=yes \
 	hpppddir=%{_cupsppddir}
 
-%if %{with cups}
-rm -f $RPM_BUILD_ROOT%{_cupsppddir}/foomatic-ppds
-mv $RPM_BUILD_ROOT{%{_datadir}/ppd/HP/*,%{_cupsppddir}}
-%endif
-
-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 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
+for tool in align clean colorcal fab firmware info levels makecopies makeuri print \
+		probe scan sendfax setup testpage timedate toolbox unload ; do
+	ln -sf %{_datadir}/%{name}/$tool.py $RPM_BUILD_ROOT%{_bindir}/hp-$tool
 done
 
-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/etc/init.d
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{install.py,hplip-install}
+rm -f $RPM_BUILD_ROOT%{_libdir}/sane/*.la
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.la
 
 %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
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %post sane
 /bin/grep -q '^hpaio' /etc/sane.d/dll.conf || echo hpaio >> /etc/sane.d/dll.conf
@@ -209,18 +186,22 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/*
+%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
+%{_sysconfdir}/udev/rules.d/*
 %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-clean
 %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-mkuri
+%attr(755,root,root) %{_bindir}/hp-plugin
 %attr(755,root,root) %{_bindir}/hp-probe
+%attr(755,root,root) %{_bindir}/hp-scan
 %attr(755,root,root) %{_bindir}/hp-sendfax
 %attr(755,root,root) %{_bindir}/hp-setup
 %attr(755,root,root) %{_bindir}/hp-testpage
@@ -228,7 +209,7 @@
 %attr(755,root,root) %{_bindir}/hp-unload
 %dir %{_datadir}/hplip
 # info about GPL v2 for some files
-%{_datadir}/hplip/COPYING
+#%{_datadir}/hplip/COPYING
 # initscript for hplip helpers
 #%{_datadir}/hplip/hplip
 #%{_datadir}/hplip/hplip.sh
@@ -237,60 +218,68 @@
 %{_datadir}/hplip/copier/*.py
 #%{_datadir}/hplip/*.png
 #%{_datadir}/hplip/*.html
-%attr(755,root,root) %{_datadir}/hplip/align
-%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/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/timedate
-%attr(755,root,root) %{_datadir}/hplip/unload
+%attr(755,root,root) %{_datadir}/hplip/align.py
+%attr(755,root,root) %{_datadir}/hplip/check.py
+%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
+%attr(755,root,root) %{_datadir}/hplip/makecopies.py
+%attr(755,root,root) %{_datadir}/hplip/plugin.py
+%attr(755,root,root) %{_datadir}/hplip/probe.py
+%attr(755,root,root) %{_datadir}/hplip/scan.py
+%attr(755,root,root) %{_datadir}/hplip/sendfax.py
+%attr(755,root,root) %{_datadir}/hplip/setup.py
+%attr(755,root,root) %{_datadir}/hplip/testpage.py
+%attr(755,root,root) %{_datadir}/hplip/timedate.py
+%attr(755,root,root) %{_datadir}/hplip/unload.py
 %{_datadir}/hplip/base
-# need look
-%{_datadir}/hplip/data
+%dir %{_datadir}/hplip/data
+%{_datadir}/hplip/data/ldl
+%{_datadir}/hplip/data/localization
+%{_datadir}/hplip/data/models
+%{_datadir}/hplip/data/pcl
+%{_datadir}/hplip/data/ps
 # fax subpackage ?
-%{_datadir}/hplip/fax
+#%{_datadir}/hplip/fax
+%{_datadir}/hplip/installer
 %{_datadir}/hplip/pcard
-%{_datadir}/hplip/plugins
 %{_datadir}/hplip/prnt
 %{_datadir}/hplip/scan
-%{_datadir}/hplip/ui
-%attr(755,root,root) %{py_sitedir}/*.so
+%attr(755,root,root) %{py_sitedir}/cupsext.so
+%attr(755,root,root) %{py_sitedir}/hpmudext.so
+%attr(755,root,root) %{py_sitedir}/pcardext.so
+%attr(755,root,root) %{py_sitedir}/scanext.so
 %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-print
 %attr(755,root,root) %{_bindir}/hp-toolbox
-%attr(755,root,root) %{_datadir}/hplip/fab
-%attr(755,root,root) %{_datadir}/hplip/toolbox
+%attr(755,root,root) %{_bindir}/hp-systray
+%attr(755,root,root) %{_datadir}/hplip/fab.py
+%attr(755,root,root) %{_datadir}/hplip/print.py
+%attr(755,root,root) %{_datadir}/hplip/toolbox.py
+%attr(755,root,root) %{_datadir}/hplip/systray.py
+%{_datadir}/hplip/plugins
+%{_datadir}/hplip/ui
+%{_datadir}/hplip/data/images
+%{_desktopdir}/hplip.desktop
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libhpip*.so.*
+%attr(755,root,root) %{_libdir}/libhpmud*.so.*
 
 %files sane
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsane*.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane*.so.*
-%{_datadir}/hplip/hpaio.desc
 
-%if %{with cups}
 %files ppd
 %defattr(644,root,root,755)
 %{_cupsppddir}/*
@@ -298,7 +287,12 @@
 %files -n cups-backend-hp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_ulibdir}/cups/backend/hp
-%endif
+%attr(755,root,root) %{_ulibdir}/cups/filter/foomatic-rip-hplip
+%attr(755,root,root) %{_ulibdir}/cups/filter/hplipjs
+
+#%files -n cups-backend-hpfax
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_ulibdir}/cups/backend/hpfax
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -306,6 +300,101 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25.2.1  2008/11/28 20:53:52  marcus
+- version 2.8.10, merged from HEAD
+- fax subpackage disabled (need hal, which is too old in Ac)
+
+Revision 1.50  2008/11/16 15:58:48  cactus
+- up to 2.8.10
+- hpaio.desc removed
+
+Revision 1.49  2008/10/03 17:44:29  arekm
+- release 2
+
+Revision 1.48  2008/07/03 11:25:09  blues
+- rel.1
+
+Revision 1.47  2008/07/01 08:55:26  tiwek
+- start update to 2.8.6 (build and work)
+
+Revision 1.46  2008/01/13 10:15:37  qboosh
+- few unpackaged files less
+
+Revision 1.45  2007-11-16 13:28:53  sls
+- cleanup and TODO update
+
+Revision 1.44  2007-11-16 13:02:45  sls
+- added patch ui-optional
+- hp-print goes to gui-tools
+- hplip/{plugins,ui} moved to gui-tools (idea from Fedora)
+
+Revision 1.43  2007-11-16 12:09:39  sls
+- hp-setup requires installer
+
+Revision 1.42  2007-11-16 12:06:17  sls
+- package hp-scan
+- don't package hp-check (seems useless for end-users)
+- TODO cleanup
+
+Revision 1.41  2007-11-16 07:26:40  sls
+- removed broken cups bcond
+- verbose py_sitedir files
+
+Revision 1.40  2007-11-16 06:33:09  sls
+- cleanup
+
+Revision 1.39  2007-11-16 06:28:47  sls
+- removed Source1 - looks like not used since very long time
+
+Revision 1.38  2007-11-16 06:18:54  sls
+- fixed ppd installing
+- removed not longer used Source1 hplip.init
+
+Revision 1.37  2007-11-16 06:08:31  sls
+- cleanup
+
+Revision 1.36  2007-11-16 06:00:53  sls
+- remove some installer files
+- cleanup
+
+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
+
+Revision 1.33  2007-11-16 04:40:19  sls
+- fixed links to hp-tools
+
+Revision 1.32  2007-11-16 04:33:29  sls
+- remove installer stuff
+- remove sane/*.la (stolen from Fedora)
+- package udev.rules
+- package scan.py
+- packaged libhpmud*.so.*
+- package sane/libsane*.so.*
+- info about unpackaged files
+
+Revision 1.31  2007-11-16 04:15:33  sls
+- disable-foomatic-xml-install (idea stolen from Fedora)
+
+Revision 1.30  2007-11-16 04:10:48  sls
+- python scripts got .py in files section
+- commented out lots of stuff in install and files section (temporary)
+
+Revision 1.29  2007-11-16 03:45:06  sls
+- ver. 2.7.10 (NFY)
+
+Revision 1.28  2007-05-22 15:32:51  qboosh
+- pl desc for cups-backend-hpfax
+
+Revision 1.27  2007/05/22 09:06:00  wiget
+- updated to 1.7.4a
+- added hpfax subpackage
+
+Revision 1.26  2007/04/02 12:16:50  baggins
+- rel 3
+
 Revision 1.25  2007/03/26 18:02:15  pascalek
 - Release 2
 - missing BuildReq and Req
================================================================

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

More information about the pld-cvs-commit mailing list