packages: hplip/hplip.spec - fix build without polkit [sic!] installed

[sparky]

Author: sparky                       Date: Sun May 16 15:56:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build without polkit [sic!] installed

---- Files affected:
packages/hplip:
   hplip.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: packages/hplip/hplip.spec
diff -u packages/hplip/hplip.spec:1.70 packages/hplip/hplip.spec:1.71
--- packages/hplip/hplip.spec:1.70	Wed May 12 12:59:58 2010
+++ packages/hplip/hplip.spec	Sun May 16 17:55:59 2010
@@ -16,20 +16,22 @@
 BuildRequires:	dbus-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libusb-devel
-BuildRequires:	libusb-compat-devel
 BuildRequires:	libtiff-devel
+BuildRequires:	libtool
+BuildRequires:	libusb-compat-devel
+BuildRequires:	libusb-devel
 BuildRequires:	net-snmp-devel
 BuildRequires:	openssl-devel
+BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 BuildRequires:	python-modules
-BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sane-backends-devel
+BuildRequires:	sed >= 4.0
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	python-modules
-Obsoletes:	hplip-daemon
 Obsoletes:	hpijs
+Obsoletes:	hplip-daemon
 Obsoletes:	python-hplip
 Conflicts:	ghostscript <= 7.00-3
 # used in scan.py
@@ -52,8 +54,8 @@
 Summary:	HPLIP GUI tools
 Summary(pl.UTF-8):	Narzędzia graficzne HPLIP
 Group:		Applications/System
-Requires:	python-PyQt4
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	python-PyQt4
 
 %description gui-tools
 HPLIP GUI tools.
@@ -130,7 +132,7 @@
 %package -n hal-hplip
 Summary:	HAL device information for HPLIP
 Group:		Applications/Printing
-Requires:       %{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description -n hal-hplip
 HAL device information for HPLIP supported devices
@@ -138,7 +140,8 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py
+%{__sed} -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py
+%{__sed} -i -e 's#test -d /usr/share/polkit-1#true#' configure
 
 %build
 install /usr/share/automake/config.* .
@@ -270,7 +273,7 @@
 %attr(755,root,root) %{py_sitedir}/hpmudext.so
 %attr(755,root,root) %{py_sitedir}/pcardext.so
 %attr(755,root,root) %{py_sitedir}/scanext.so
-%{_sysconfdir}/dbus-1/system.d/com.hp.hplip.conf
+/etc/dbus-1/system.d/com.hp.hplip.conf
 %dir %{_sysconfdir}/hp
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hp/*
 
@@ -344,6 +347,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2010/05/16 15:55:59  sparky
+- fix build without polkit [sic!] installed
+
 Revision 1.70  2010/05/12 10:59:58  baggins
 - rel 4
 - desktop file cleanup
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip.spec?r1=1.70&r2=1.71&f=u