SPECS (AC-branch): udev.spec - up to 056 (stay tuned for more) - d...

[saq]

Author: saq                          Date: Fri Jul 29 11:51:16 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 056 (stay tuned for more)
- drop what's obsolete: patches, sedding, permissions.d

---- Files affected:
SPECS:
   udev.spec (1.39.2.8 -> 1.39.2.9) 

---- Diffs:

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.39.2.8 SPECS/udev.spec:1.39.2.9
--- SPECS/udev.spec:1.39.2.8	Sat May 21 12:39:47 2005
+++ SPECS/udev.spec	Fri Jul 29 13:51:11 2005
@@ -7,21 +7,18 @@
 Summary:	A userspace implementation of devfs
 Summary(pl):	Implementacja devfs w przestrzeni użytkownika
 Name:		udev
-Version:	050
-Release:	2
+Version:	056
+Release:	1
 License:	GPL
 Group:		Base
 Source0:	http://www.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-# Source0-md5:	eefa5f012ae66ac5adc7d9d7a6a5a6fc
+# Source0-md5:	30fb3a320e74ff0c49c15ecaa6e37a4c
 Source1:	%{name}.rules
-Source2:	%{name}.permissions
 Source3:	%{name}.conf
 Source4:	start_udev
 Source5:	devmap_name.tar.gz
 # Source5-md5:	f72f557299436af5d6ad66815b80a641
 Source6:	%{name}-check-cdrom.sh
-Patch0:		%{name}-029-moreconf.patch
-Patch1:		%{name}-032-symlink.patch
 BuildRequires:	device-mapper-devel
 BuildRequires:	libselinux-devel >= 1.17.13
 BuildRequires:	sed >= 4.0
@@ -32,7 +29,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
-%define		extras		extras/scsi_id extras/volume_id
+%define		extras		extras/chassis_id extras/scsi_id extras/volume_id
 
 %description
 A userspace implementation of devfs for 2.5 and higher kernels.
@@ -56,8 +53,7 @@
 
 %prep
 %setup -q -a5
-%patch0 -p1
-%patch1 -p1
+sed -i -e 's#gcc#$(CC)#g' devmap_name/Makefile
 
 %build
 %if %{with initrd}
@@ -79,13 +75,10 @@
 %{__make} clean
 %endif
 
-sed -i -e 's#gcc#$(CC)#g' devmap_name/Makefile
 %{__make} -C devmap_name \
 	CC="%{__cc}" \
 	OPTFLAGS="%{rpmcflags}"
 
-sed 's/LOGNAME_SIZE/64/' \
-	-i extras/volume_id/udev_volume_id.c
 %{__make} \
 	udevdir=/udev \
 	CC="%{__cc}" \
@@ -99,7 +92,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_prefix}/sbin,/udev}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,permissions.d,scripts}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,scripts}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block,net,snd}
 install -d $RPM_BUILD_ROOT/udev
 
@@ -109,11 +102,9 @@
 	EXTRAS="%{extras}"
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.permissions
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/permissions.d/50-udev.permissions
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/start_udev
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/check-cdrom.sh
@@ -151,7 +142,6 @@
 
 %attr(755,root,root) %dir %{_sysconfdir}/udev
 %attr(755,root,root) %dir %{_sysconfdir}/udev/rules.d
-%attr(755,root,root) %dir %{_sysconfdir}/udev/permissions.d
 %attr(755,root,root) %dir %{_sysconfdir}/udev/scripts
 
 %attr(755,root,root) %{_sysconfdir}/udev/scripts/hotplug.dev
@@ -159,9 +149,6 @@
 
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/udev.conf
 %config(noreplace) %verify(not size mtime md5)  %{_sysconfdir}/udev/rules.d/50-udev.rules
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/permissions.d/50-udev.permissions
-
-%attr(755,root,root) %{_sbindir}/devmap_name
 
 %config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
 
@@ -181,6 +168,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39.2.9  2005/07/29 11:51:11  saq
+- up to 056 (stay tuned for more)
+- drop what's obsolete: patches, sedding, permissions.d
+
 Revision 1.39.2.8  2005/05/21 10:39:47  ankry
 - rel. 2
 
================================================================

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