SPECS: udev.spec - drop obsolete configs/rules

[arekm]

Author: arekm                        Date: Tue Jul 22 21:24:42 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop obsolete configs/rules

---- Files affected:
SPECS:
   udev.spec (1.243 -> 1.244) 

---- Diffs:

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.243 SPECS/udev.spec:1.244
--- SPECS/udev.spec:1.243	Tue Jul 22 23:10:19 2008
+++ SPECS/udev.spec	Tue Jul 22 23:24:37 2008
@@ -42,19 +42,13 @@
 # Source0-md5:	27832847086383309bb3acbde2486e29
 # rules
 Source1:	%{name}-alsa.rules
-Source2:	%{name}-hotplug_map.rules
-Source3:	%{name}-modprobe.rules
-#Source4:	%{name}.rules
-Source5:	%{name}-example.rules
-Source11:	%{name}-links.conf
+#Source2:	%{name}.rules
+Source3:	%{name}-links.conf
 # scripts / helpers
-Source20:	%{name}_import_usermap
-Source21:	%{name}-net.helper
-Source22:	start_udev
+Source10:	%{name}-net.helper
+Source11:	start_udev
 # misc
-Source30:	%{name}-usb.distmap
-Source31:	%{name}-usb.handmap
-Source32:	%{name}.blacklist
+Source20:	%{name}.blacklist
 Patch0:		%{name}-lib64.patch
 URL:		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRequires:	device-mapper-devel
@@ -154,18 +148,6 @@
 %description -n libvolume_id-static -l pl.UTF-8
 Statyczna biblioteka libvolume_id.
 
-%package tools
-Summary:	udev tools
-Summary(pl.UTF-8):	Narzędzia udev
-Group:		Base
-Requires:	%{name}-core = %{epoch}:%{version}-%{release}
-
-%description tools
-udev tools - programs not needed for bootup.
-
-%description tools -l pl.UTF-8
-Narzędzia udev - programy nie wymagane do startu systemu.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -258,32 +240,28 @@
 # install additional rules
 install rules/suse/64-device-mapper.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
-sed -e 's#/lib/udev/#/%{_lib}/udev/#g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-modprobe.rules
-#install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev-pld.rules
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-udev-example.rules
+#install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev-pld.rules
 
+# needed on kernels < 2.6.25
 cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/05-udev-early.rules
 # sysfs is populated after the event is sent
 ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
 EOF
 
 # install configs
-install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/udev/links.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/links.conf
 
 # install executables (scripts, helpers, etc.)
-install -D %{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 %{SOURCE10} $RPM_BUILD_ROOT/%{_lib}/udev/net_helper
+install %{SOURCE11} $RPM_BUILD_ROOT%{_sbindir}/start_udev
 
 install extras/path_id/path_id $RPM_BUILD_ROOT/%{_lib}/udev
 
 install extras/volume_id/lib/*.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 
-
 # install misc
-install %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev_blacklist.conf
+install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev_blacklist.conf
 
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_sbindir}
@@ -358,11 +336,8 @@
 %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/40-alsa.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/64-device-mapper.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
-%{_sysconfdir}/udev/rules.d/10-udev-example.rules
-%{_sysconfdir}/udev/rules.d/55-hotplug_map.rules
 
 # rules below are NOT supposed to be changed by users
 %dir /%{_lib}/udev/rules.d
@@ -387,10 +362,6 @@
 %attr(755,root,root) %{_sbindir}/udevstart.initrd
 %endif
 
-%files tools
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_prefix}/sbin/udev_import_usermap
-
 %files -n libvolume_id
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libvolume_id.so.*.*.*
@@ -412,6 +383,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.244  2008/07/22 21:24:37  arekm
+- drop obsolete configs/rules
+
 Revision 1.243  2008/07/22 21:10:19  arekm
 - use udev.conf from udev package, no need to put it into cvs/SOURCES
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/udev.spec?r1=1.243&r2=1.244&f=u