SPECS: hal.spec - dropped hotplug.d support, use udev rule instead...

[freetz]

Author: freetz                       Date: Tue Oct 18 20:15:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped hotplug.d support, use udev rule instead, rel. 5.1

---- Files affected:
SPECS:
   hal.spec (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.92 SPECS/hal.spec:1.93
--- SPECS/hal.spec:1.92	Thu Oct 13 20:34:38 2005
+++ SPECS/hal.spec	Tue Oct 18 22:15:24 2005
@@ -8,7 +8,7 @@
 Summary(pl):	HAL - abstrakcyjna warstwa dostępu do sprzętu
 Name:		hal
 Version:	0.5.4
-Release:	5
+Release:	5.1
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@
 Source1:	%{name}daemon.init
 Source2:	%{name}d.sysconfig
 Source3:	%{name}-device-manager.desktop
+Source4:	%{name}.rules
 Patch0:		%{name}-device_manager.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-pld_policy.patch
@@ -55,7 +56,7 @@
 Requires:	mount >= 2.12-14
 %pyrequires_eq	python
 Requires:	python-dbus >= 0.33
-Requires:	udev >= 068
+Requires:	udev >= 070-5.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -147,7 +148,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT{/etc/{sysconfig,rc.d}/init.d,%{_desktopdir}} \
-	$RPM_BUILD_ROOT/etc/hal/fdi/{information,policy,preprobe}
+	$RPM_BUILD_ROOT/etc/hal/fdi/{information,policy,preprobe} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -159,6 +161,9 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/haldaemon
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/hald
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-hal.rules
+
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d
 
 %find_lang %{name}
 
@@ -195,11 +200,12 @@
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_sysconfdir}/%{name}
 %{_sysconfdir}/%{name}/fdi
-%{_sysconfdir}/hotplug.d/default/*
+
 %attr(754,root,root) /etc/rc.d/init.d/*
 %attr(755,root,root) %{_libdir}/hal.hotplug
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hald
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus*/system.d/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/60-hal.rules
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/fdi
@@ -239,6 +245,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2005/10/18 20:15:24  freetz
+- dropped hotplug.d support, use udev rule instead, rel. 5.1
+
 Revision 1.92  2005/10/13 18:34:38  freetz
 - added powersave support, rel.5
 
================================================================

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