SPECS (UDEV-124): udev.spec - /lib/udev for all archs, cleanup

Tue Feb 10 21:10:57 CET 2009

Author: hawk                         Date: Tue Feb 10 20:10:57 2009 GMT
Module: SPECS                         Tag: UDEV-124
---- Log message:
- /lib/udev for all archs, cleanup

---- Files affected:
SPECS:
   udev.spec (1.240 -> 1.240.2.1) 

---- Diffs:

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.240 SPECS/udev.spec:1.240.2.1

--- SPECS/udev.spec:1.240	Sat Jun 14 15:27:19 2008
+++ SPECS/udev.spec	Tue Feb 10 21:10:51 2009
@@ -33,7 +33,7 @@
 Summary(pl.UTF-8):	Zarządca urządzeń dla Linuksa 2.6
 Name:		udev
 Version:	124
-Release:	2
+Release:	2.1
 Epoch:		1
 License:	GPL
 Group:		Base
@@ -56,7 +56,6 @@
 Source30:	%{name}-usb.distmap
 Source31:	%{name}-usb.handmap
 Source32:	%{name}.blacklist
-Patch0:		%{name}-lib64.patch
 URL:		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRequires:	device-mapper-devel
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.17.13}
@@ -169,10 +168,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 sed -i -e 's/$(CC) -shared/$(LD) -shared/' extras/volume_id/lib/Makefile
-sed -i -e 's#/lib/udev/#/%{_lib}/udev/#g' *.c extras/rule_generator/write_*
 
 %build
 %if %{with initrd}
@@ -201,18 +198,6 @@
 cp -a udevd initrd-udevd
 cp -a udevadm initrd-udevadm
 
-# What is this FIXME business and why is initrd
-# broken, if it's fine?
-# FIXME, cause I'm broken - your initrd
-%if 0
-cp -a extras/ata_id/ata_id initrd-ata_id
-cp -a extras/cdrom_id/cdrom_id initrd-cdrom_id
-cp -a extras/edd_id/edd_id initrd-edd_id
-cp -a extras/scsi_id/scsi_id initrd-scsi_id
-cp -a extras/usb_id/usb_id initrd-usb_id
-cp -a extras/volume_id/vol_id initrd-vol_id
-%endif
-
 %if %{with main}
 %{__make} clean \
 	EXTRAS="%{static_extras}" \
@@ -222,7 +207,7 @@
 
 %if %{with main}
 %{__make} \
-	libudevdir=/%{_lib}/udev \
+	libudevdir=/lib/udev \
 	libdir=/%{_lib} \
 	usrlibdir=%{_libdir} \
 	udevdir=/dev \
@@ -241,12 +226,12 @@
 
 %if %{with main}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,udev/rules.d} \
-	$RPM_BUILD_ROOT/%{_lib}/udev/devices
+	$RPM_BUILD_ROOT/lib/udev/devices
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	initdir=/etc/rc.d/init.d \
-        libudevdir=/%{_lib}/udev \
+        libudevdir=/lib/udev \
         libdir=/%{_lib} \
         usrlibdir=%{_libdir} \
         udevdir=/dev \
@@ -261,7 +246,7 @@
 install etc/udev/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 %{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 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-udev-example.rules
 
@@ -276,10 +261,10 @@
 
 # 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 %{SOURCE21} $RPM_BUILD_ROOT/lib/udev/net_helper
 install %{SOURCE22} $RPM_BUILD_ROOT%{_sbindir}/start_udev
 
-install extras/path_id/path_id $RPM_BUILD_ROOT/%{_lib}/udev
+install extras/path_id/path_id $RPM_BUILD_ROOT/lib/udev
 
 install extras/volume_id/lib/*.a $RPM_BUILD_ROOT%{_libdir}
 %endif
@@ -308,7 +293,7 @@
 
 %triggerpostun core -- udev < 108
 sed -i -e 's#IMPORT{program}="/sbin/#IMPORT{program}="#g' /etc/udev/rules.d/*.rules
-sed -i -e 's#/lib/udev/#/%{_lib}/udev/#g' /etc/udev/rules.d/*.rules
+sed -i -e 's#/lib/udev/#/lib/udev/#g' /etc/udev/rules.d/*.rules
 
 %post	-n libvolume_id -p /sbin/ldconfig
 %postun	-n libvolume_id -p /sbin/ldconfig
@@ -325,26 +310,26 @@
 %doc ChangeLog FAQ README RELEASE-NOTES TODO
 %doc docs/{overview,udev_vs_devfs,writing_udev_rules}
 
-%dir /%{_lib}/udev
+%dir /lib/udev
 
-# /%{_lib}/udev/devices is recommended as a directory where packages or
+# /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
+%dir /lib/udev/devices
 
-%attr(755,root,root) /%{_lib}/udev/create_floppy_devices
-%attr(755,root,root) /%{_lib}/udev/firmware.sh
+%attr(755,root,root) /lib/udev/create_floppy_devices
+%attr(755,root,root) /lib/udev/firmware.sh
 
-%attr(755,root,root) /%{_lib}/udev/*_helper
+%attr(755,root,root) /lib/udev/*_helper
 
-%attr(755,root,root) /%{_lib}/udev/ata_id
-%attr(755,root,root) /%{_lib}/udev/cdrom_id
-%attr(755,root,root) /%{_lib}/udev/edd_id
-%attr(755,root,root) /%{_lib}/udev/path_id
-%attr(755,root,root) /%{_lib}/udev/scsi_id
-%attr(755,root,root) /%{_lib}/udev/usb_id
-%attr(755,root,root) /%{_lib}/udev/vol_id
+%attr(755,root,root) /lib/udev/ata_id
+%attr(755,root,root) /lib/udev/cdrom_id
+%attr(755,root,root) /lib/udev/edd_id
+%attr(755,root,root) /lib/udev/path_id
+%attr(755,root,root) /lib/udev/scsi_id
+%attr(755,root,root) /lib/udev/usb_id
+%attr(755,root,root) /lib/udev/vol_id
 
 %attr(755,root,root) %{_sbindir}/start_udev
 %attr(755,root,root) %{_sbindir}/udevd
@@ -411,6 +396,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.240.2.1  2009/02/10 20:10:51  hawk
+- /lib/udev for all archs, cleanup
+
 Revision 1.240  2008/06/14 13:27:19  arekm
 - rel 2; fix trigger and settle
 
================================================================

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

