X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.spec;h=2b8eb054c02a01e8fdbfcd57b12578302f4c6ab6;hp=79b69524150a9c23c8cfe651c3764ef8d7fb508a;hb=2321ba6fd89635f321ec08fa3803aa7e20aa76bf;hpb=1eae2f3f712ff839bf80721bf9c44a76a78460dc

diff --git a/udev.spec b/udev.spec
index 79b695241..2b8eb054c 100644
--- a/udev.spec
+++ b/udev.spec
@@ -27,9 +27,9 @@
 # 1 - build it
 %define volume_id 1
 
-Summary: A userspace implementation of devfs
+Summary: A userspace device manager providing devfs functionality
 Name: udev
-Version: 025
+Version: 070
 Release: 1
 License: GPL
 Group: Utilities/System
@@ -41,8 +41,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Prereq: /bin/sh, fileutils, hotplug
 
 %description
-udev is a implementation of devfs in userspace using sysfs and
-/sbin/hotplug. It requires a 2.6 kernel to run properly.
+udev is a userspace device manager, using sysfs and uevents
+to provide a devfs-like device directory management and uevent
+dispatching.
 
 %prep
 %setup -q
@@ -72,6 +73,7 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 "
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install \
 	EXTRAS="	\
 %if %{scsi_id}
@@ -97,7 +99,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc COPYING README TODO ChangeLog HOWTO* docs/*
 %doc etc/udev/udev.rules.{examples,gentoo,redhat}
-%doc etc/udev/udev.permissions.{gentoo,redhat}
 %attr(755,root,root) /sbin/udev
 %attr(755,root,root) /usr/bin/udevinfo
 %attr(755,root,root) /sbin/udevsend
@@ -107,8 +108,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir /udev/
 %attr(755,root,root) %dir /etc/udev/
 %config(noreplace) %attr(0644,root,root) /etc/udev/udev.conf
-%config(noreplace) %attr(0644,root,root) /etc/udev/udev.rules
-%config(noreplace) %attr(0644,root,root) /etc/udev/udev.permissions
+%attr(755,root,root) %dir /etc/udev/rules.d/
+%config(noreplace) %attr(0644,root,root) /etc/udev/rules.d/50-udev.rules
 %attr(-,root,root) /etc/hotplug.d/default/udev.hotplug
 %attr(755,root,root) /etc/init.d/udev
 %attr(0644,root,root) %{_mandir}/man8/udev*.8*