SPECS: udev.spec - started work on 076, /lib/udev introduced as de...

[freetz]

Author: freetz                       Date: Fri Nov 25 21:18:00 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- started work on 076, /lib/udev introduced as default scripts/helpers dir,
  some comments added

---- Files affected:
SPECS:
   udev.spec (1.139 -> 1.140) 

---- Diffs:

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.139 SPECS/udev.spec:1.140
--- SPECS/udev.spec:1.139	Tue Nov 22 16:19:23 2005
+++ SPECS/udev.spec	Fri Nov 25 22:17:55 2005
@@ -30,13 +30,13 @@
 Summary:	A userspace implementation of devfs
 Summary(pl):	Implementacja devfs w przestrzeni użytkownika
 Name:		udev
-Version:	075
-Release:	2
+Version:	076
+Release:	0.1
 Epoch:		1
 License:	GPL
 Group:		Base
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-# Source0-md5:	024ce408f74b05ff6b52b4ff250359da
+# Source0-md5:	9054b6e8e2b20a8e73e9a7bc7f4d67d0
 Source1:	%{name}.rules
 Source2:	%{name}.conf
 Source3:	start_udev
@@ -179,7 +179,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with main}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/udev/{agents.d/usb,rules.d,scripts,devices}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/udev/{agents.d/usb,rules.d} \
+	$RPM_BUILD_ROOT/lib/udev/devices
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -199,15 +200,18 @@
 install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/persistent.rules
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/hotplug_map.rules
 
-install %{SOURCE20} $RPM_BUILD_ROOT%{_sbindir}/udev_ieee1394_helper
-install %{SOURCE21} $RPM_BUILD_ROOT%{_sbindir}/udev_input_helper
-install %{SOURCE22} $RPM_BUILD_ROOT%{_sbindir}/udev_net_helper
-install %{SOURCE23} $RPM_BUILD_ROOT%{_sbindir}/udev_input_coldplug
+# Default location for rule sripts and helper programs is now: /lib/udev/
+# Everything that is not useful on the commandline should go into this
+# directory.
+install %{SOURCE20} $RPM_BUILD_ROOT/lib/udev/udev_ieee1394_helper
+install %{SOURCE21} $RPM_BUILD_ROOT/lib/udev/udev_input_helper
+install %{SOURCE22} $RPM_BUILD_ROOT/lib/udev/udev_net_helper
+install %{SOURCE23} $RPM_BUILD_ROOT/lib/udev/udev_input_coldplug
+install extras/dvb.sh $RPM_BUILD_ROOT/lib/udev
+install extras/eventrecorder.sh $RPM_BUILD_ROOT/lib/udev
+install extras/raid-devfs.sh $RPM_BUILD_ROOT/lib/udev
 
 install extras/path_id $RPM_BUILD_ROOT%{_sbindir}
-install extras/dvb.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts
-install extras/raid-devfs.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts
-install extras/eventrecorder.sh $RPM_BUILD_ROOT%{_sbindir}
 install uevent_listen $RPM_BUILD_ROOT%{_sbindir}
 install udevsynthesize $RPM_BUILD_ROOT%{_sbindir}
 
@@ -247,6 +251,24 @@
 %doc libsysfs/libsysfs.txt
 %doc extras/start_udev
 
+%dir /lib/udev
+
+# /lib/udev/devices is recommended as a directory where packages or                                                  
+# the user can place real device nodes, which get copied over to /dev at                                                  
+# every boot. This should replace the various solutions with custom config                                                
+# files.    
+%dir /lib/udev/devices
+
+%attr(755,root,root) /lib/udev/create_floppy_devices
+%attr(755,root,root) /lib/udev/dvb.sh
+%attr(755,root,root) /lib/udev/eventrecorder.sh
+%attr(755,root,root) /lib/udev/firmware_helper
+%attr(755,root,root) /lib/udev/raid-devfs.sh
+%attr(755,root,root) /lib/udev/udev_ieee1394_helper
+%attr(755,root,root) /lib/udev/udev_input_coldplug
+%attr(755,root,root) /lib/udev/udev_input_helper
+%attr(755,root,root) /lib/udev/udev_net_helper
+
 %attr(755,root,root) %{_sbindir}/ata_id
 %attr(755,root,root) %{_sbindir}/cdrom_id
 %attr(755,root,root) %{_sbindir}/dasd_id
@@ -256,13 +278,6 @@
 %attr(755,root,root) %{_sbindir}/usb_id
 %attr(755,root,root) %{_sbindir}/vol_id
 
-%attr(755,root,root) %{_sbindir}/create_floppy_devices
-%attr(755,root,root) %{_sbindir}/firmware_helper
-%attr(755,root,root) %{_sbindir}/udev_ieee1394_helper
-%attr(755,root,root) %{_sbindir}/udev_input_coldplug
-%attr(755,root,root) %{_sbindir}/udev_input_helper
-%attr(755,root,root) %{_sbindir}/udev_net_helper
-
 %attr(755,root,root) %{_sbindir}/start_udev
 %attr(755,root,root) %{_sbindir}/udev
 %attr(755,root,root) %{_sbindir}/udevcontrol
@@ -272,17 +287,13 @@
 %attr(755,root,root) %{_sbindir}/udevsynthesize
 %attr(755,root,root) %{_sbindir}/uevent_listen
  
-%attr(755,root,root) %{_sbindir}/eventrecorder.sh
-
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_prefix}/sbin/*
 
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/agents.d
 %dir %{_sysconfdir}/udev/agents.d/usb
-%dir %{_sysconfdir}/udev/devices
 %dir %{_sysconfdir}/udev/rules.d
-%dir %{_sysconfdir}/udev/scripts
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scsi_id.config
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/udev.rules
@@ -291,8 +302,6 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
 %{_sysconfdir}/udev/rules.d/hotplug_map.rules
 
-%attr(755,root,root) %{_sysconfdir}/udev/scripts/*
-
 %{_mandir}/man8/*
 
 %dev(c,1,3) %attr(666,root,root) /dev/null
@@ -317,6 +326,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.140  2005/11/25 21:17:55  freetz
+- started work on 076, /lib/udev introduced as default scripts/helpers dir,
+  some comments added
+
 Revision 1.139  2005/11/22 15:19:23  freetz
 - MAKEDEV is required to precreate device nodes not handled by udev, rel.2
 
================================================================

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