SPECS: udev.spec - added hotplug usb maps (converted to rules), dr...

[freetz]

Author: freetz                       Date: Wed Oct 19 10:35:31 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added hotplug usb maps (converted to rules), dropped hotplug support

---- Files affected:
SPECS:
   udev.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.110 SPECS/udev.spec:1.111
--- SPECS/udev.spec:1.110	Wed Oct 19 02:10:05 2005
+++ SPECS/udev.spec	Wed Oct 19 12:35:26 2005
@@ -42,6 +42,7 @@
 Source3:	%{name}.conf
 Source4:	start_udev
 Source6:	ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/uevent_listen.c
+# Source6-md5:	7b2b881a8531fd84da7cae9152dc4e39
 # from Mandriva CVS:
 # http://cvs.mandriva.com/cgi-bin/cvsweb.cgi/SPECS/udev/udev_import_usermap?rev=1.5
 Source7:	udev_import_usermap
@@ -50,7 +51,10 @@
 # http://qa.mandrivalinux.com/twiki/bin/view/Main/Udev
 # http://lwn.net/Articles/123932/
 Source8:	%{name}-modprobe.rules
-# Source6-md5:	7b2b881a8531fd84da7cae9152dc4e39
+# hotplug usb maps
+Source10:	%{name}-usb.digicam
+Source11:	%{name}-usb.distmap
+Source12:	%{name}-usb.handmap
 Patch0:		udev-synthesize-02.patch
 Patch1:		udev-synthesize-md
 Patch2:		udev-synthesize-preserve_env
@@ -65,8 +69,8 @@
 %{?with_klibc:BuildRequires:	linux-libc-headers}
 %endif
 Requires:	coreutils
-Requires:	hotplug >= 2003_08_05
 Provides:	dev = 3.0.0
+Obsoletes:	hotplug
 # Obsoletes:	dev
 Obsoletes:	udev-dev
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -185,6 +189,10 @@
 ln -s initrd-udev $RPM_BUILD_ROOT%{_sbindir}/udevstart.initrd
 %endif
 
+$RPM_BUILD_ROOT%{_prefix}/sbin/udev_import_usermap usb \
+    %{SOURCE10} %{SOURCE11} %{SOURCE12} > $RPM_BUILD_ROOT/etc/udev/rules.d/70-hotplug_map.rules
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -224,11 +232,12 @@
 %attr(755,root,root) %dir %{_sysconfdir}/udev/rules.d
 %attr(755,root,root) %dir %{_sysconfdir}/udev/scripts
 
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/udev.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/scsi_id.config
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/rules.d/50-udev.rules
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/rules.d/999-firmware.rules
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/rules.d/999-modprobe.rules
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/scsi_id.config
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/udev.conf
+%{_sysconfdir}/udev/rules.d/70-hotplug_map.rules
 
 %attr(755,root,root) %{_sysconfdir}/udev/scripts/*
 
@@ -251,6 +260,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2005/10/19 10:35:26  freetz
+- added hotplug usb maps (converted to rules), dropped hotplug support
+
 Revision 1.110  2005/10/19 00:10:05  jpc
 - add a helper script from Mandriva (does it need to be packaged?)
 - add rules for completely udev based hotplug/module loading (uses
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/udev.spec?r1=1.110&r2=1.111&f=u