SPECS: hal.spec rel 3; use policykit; fix libpci detection

[arekm]

Author: arekm                        Date: Sun Dec  3 22:36:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
rel 3; use policykit; fix libpci detection

---- Files affected:
SPECS:
   hal.spec (1.122 -> 1.123) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.122 SPECS/hal.spec:1.123
--- SPECS/hal.spec:1.122	Sun Dec  3 23:01:51 2006
+++ SPECS/hal.spec	Sun Dec  3 23:36:08 2006
@@ -7,7 +7,7 @@
 Summary(pl):	HAL - abstrakcyjna warstwa dostępu do sprzętu
 Name:		hal
 Version:	0.5.8.1
-Release:	2
+Release:	3
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
@@ -24,12 +24,13 @@
 Patch3:		%{name}-samsung_yp_z5.patch
 Patch4:		%{name}-libpci.patch
 URL:		http://freedesktop.org/Software/hal
+BuildRequires:	PolicyKit-devel
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.71
 %if %{with docs}
-BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-dtd41-sgml
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-utils
 BuildRequires:	doxygen
 %endif
@@ -48,14 +49,13 @@
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	which
-# BR: polkit >= 0.2 (strongly advised by configure for security)
 # BR: libparted-devel == 1.7.1 (optional, used with --enable-parted only, needs EQUAL version)
 # R: cryptsetup-luks >= 1.0.1 (at runtime)
-Requires(pre):	/usr/bin/getgid
+Requires(post,preun):	/sbin/chkconfig
 Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(post,preun):	/sbin/chkconfig
 %pyrequires_eq	python
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus >= 0.91
@@ -125,10 +125,10 @@
 Summary:	HAL device manager for GNOME
 Summary(pl):	Zarządca urządzeń HALa dla GNOME
 Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
 Requires:	python-gnome-ui
 Requires:	python-gnome-vfs
 Requires:	python-pygtk-glade
-Requires:	%{name} = %{version}-%{release}
 
 %description device-manager
 GNOME program for displaying devices detected by HAL.
@@ -143,17 +143,17 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	libusb >= 0.1.10a
 Requires:	udev >= 1:089
+Provides:	udev-digicam
 Obsoletes:	hotplug-digicam
 Obsoletes:	udev-digicam
-Provides:	udev-digicam
 
 %description gphoto
 Set of Udev rules and HAL device information file to handle digital
 cameras in userspace.
 
 %description gphoto -l pl
-Zestaw reguł Udev i plik z informacjami o urządzeniach HALa do
-obsługi kamer cyfrowych w przestrzeni użytkownika.
+Zestaw reguł Udev i plik z informacjami o urządzeniach HALa do obsługi
+kamer cyfrowych w przestrzeni użytkownika.
 
 %prep
 %setup -q
@@ -179,7 +179,6 @@
 	--enable-fstab-sync \
 	--enable-pcmcia-support \
 	--enable-selinux \
-	--disable-policy-kit \
 	--with-html-dir=%{_gtkdocdir} \
 	--with-hwdata=%{_sysconfdir} \
 	--with-pid-file=%{_localstatedir}/run/hald.pid
@@ -271,6 +270,8 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus*/system.d/*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/*
 
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PolicyKit/privilege.d/*
+
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/fdi
 
@@ -315,6 +316,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2006/12/03 22:36:08  arekm
+rel 3; use policykit; fix libpci detection
+
 Revision 1.122  2006/12/03 22:01:51  arekm
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.122&r2=1.123&f=u