SPECS: udev.spec - dropped persistent rules creation (not really u...

[freetz]

Author: freetz                       Date: Wed May 10 20:02:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped persistent rules creation (not really usable with current PLD
  udev state), added early.rules, rel.0.3

---- Files affected:
SPECS:
   udev.spec (1.176 -> 1.177) 

---- Diffs:

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.176 SPECS/udev.spec:1.177
--- SPECS/udev.spec:1.176	Tue May  2 21:02:03 2006
+++ SPECS/udev.spec	Wed May 10 22:02:21 2006
@@ -33,7 +33,7 @@
 Summary(pl):	Implementacja devfs w przestrzeni użytkownika
 Name:		udev
 Version:	091
-Release:	0.2
+Release:	0.3
 Epoch:		1
 License:	GPL
 Group:		Base
@@ -44,7 +44,7 @@
 Source2:	%{name}-hotplug_map.rules
 Source3:	%{name}-modprobe.rules
 Source4:	%{name}.rules
-Source5:	%{name}-create_persistent.rules
+Source5:	%{name}-early.rules
 # configs
 Source10:	%{name}.conf
 Source11:	%{name}-links.conf
@@ -52,14 +52,10 @@
 Source20:	%{name}_import_usermap
 Source21:	%{name}-net.helper
 Source22:	start_udev
-Source23:	%{name}-create_persistent
-Source24:	%{name}-cdrom_helper
-Source25:	%{name}-net_name_helper
 # misc
 Source30:	%{name}-usb.distmap
 Source31:	%{name}-usb.handmap
 Source32:	%{name}.blacklist
-Source33:	%{name}-functions
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-ioctl.patch
 URL:		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -226,13 +222,13 @@
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
 
 # install rules
+install etc/udev/60-persistent-storage.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+install etc/udev/suse/60-persistent-input.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa.rules
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/55-hotplug_map.rules
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-modprobe.rules
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev-default.rules
-install etc/udev/*.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-install etc/udev/suse/60-persistent-input.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-create_persistent.rules
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/05-early.rules
 
 # install configs
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/udev
@@ -242,15 +238,11 @@
 install %{SOURCE20} $RPM_BUILD_ROOT%{_prefix}/sbin/udev_import_usermap
 install %{SOURCE21} $RPM_BUILD_ROOT/lib/udev/net_helper
 install %{SOURCE22} $RPM_BUILD_ROOT%{_sbindir}/start_udev
-install %{SOURCE23} $RPM_BUILD_ROOT/lib/udev/create_persistent
-install %{SOURCE24} $RPM_BUILD_ROOT/lib/udev/cdrom_helper
-install %{SOURCE25} $RPM_BUILD_ROOT/lib/udev/net_name_helper
 install extras/path_id/path_id $RPM_BUILD_ROOT/lib/udev
 %endif
 
 # install misc
 install %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev.blacklist
-install %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/udev/functions.udev
 
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_sbindir}
@@ -288,7 +280,6 @@
 %dir /lib/udev/devices
 
 %attr(755,root,root) /lib/udev/create_floppy_devices
-%attr(755,root,root) /lib/udev/create_persistent
 %attr(755,root,root) /lib/udev/firmware_helper
 
 %attr(755,root,root) /lib/udev/*_helper
@@ -313,18 +304,16 @@
 
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
-%{_sysconfdir}/udev/functions.udev
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.d/udev.blacklist
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scsi_id.config
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/links.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/05-udev-early.rules
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/05-early.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/40-alsa.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/50-udev-default.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/51-modprobe.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/60-persistent-input.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/60-persistent-storage.rules
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-create_persistent.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
 %{_sysconfdir}/udev/rules.d/55-hotplug_map.rules
 
@@ -363,6 +352,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177  2006/05/10 20:02:21  freetz
+- dropped persistent rules creation (not really usable with current PLD
+  udev state), added early.rules, rel.0.3
+
 Revision 1.176  2006/05/02 19:02:03  freetz
 - rel.0.2 for testing
 
================================================================

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