X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.spec;h=bdbcb4129e4d135af248457ece610b2377a1599f;hp=2445b40de5ed80ab5576f0576ca7fd3a197c3878;hb=eb6c7cd03635ffc28798734f0b87b9e21dae6f9e;hpb=04b902d5bfff632765688ac0f1c7a19a6ef6e0ea

diff --git a/udev.spec b/udev.spec
index 2445b40de..bdbcb4129 100644
--- a/udev.spec
+++ b/udev.spec
@@ -17,24 +17,19 @@
 # 1 - debugging enabled
 %define debug 0
 
-# if we want to build the DBUS "extra" package or not
-# 0 - no DBUS support
-# 1 - DBUS support
-%define dbus 0
-
-# if we want to build the SELinux "extra" package or not
-# 0 - no SELinux support
-# 1 - SELinux support
-%define selinux 0
-
 # if we want to build the scsi_id "extra" package or not
 # 0 - do not build the package
 # 1 - build it
 %define scsi_id 1
 
+# if we want to build the volume_id "extra" package or not
+# 0 - do not build the package
+# 1 - build it
+%define volume_id 1
+
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 023
+Version: 030
 Release: 1
 License: GPL
 Group: Utilities/System
@@ -71,25 +66,20 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 %if %{scsi_id}
 	extras/scsi_id	\
 %endif
-%if %{dbus}
-	extras/dbus	\
-%endif
-%if %{selinux}
-	extras/selinux	\
+%if %{volume_id}
+	extras/volume_id	\
 %endif
 "
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install \
 	EXTRAS="	\
 %if %{scsi_id}
 	extras/scsi_id	\
 %endif
-%if %{dbus}
-	extras/dbus	\
-%endif
-%if %{selinux}
-	extras/selinux	\
+%if %{volume_id}
+	extras/volume_id	\
 %endif
 "
 
@@ -113,28 +103,36 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /usr/bin/udevinfo
 %attr(755,root,root) /sbin/udevsend
 %attr(755,root,root) /sbin/udevd
-%attr(755,root,root) /sbin/udevtest
+%attr(755,root,root) /usr/bin/udevtest
 %attr(755,root,root) /sbin/udevstart
 %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/
+%attr(755,root,root) %dir /etc/udev/permissions.d/
+%config(noreplace) %attr(0644,root,root) /etc/udev/rules.d/50-udev.rules
+%config(noreplace) %attr(0644,root,root) /etc/udev/permissions.d/50-udev.permissions
 %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*
-
-%if %{dbus}
-	%config(noreplace) %attr(0644,root,root) /etc/dbus-1/system.d/udev_sysbus_policy.conf
-%endif
+%attr(755,root,root) %dir /etc/dev.d/
+%attr(755,root,root) %dir /etc/dev.d/net/
+%attr(0755,root,root) /etc/dev.d/net/hotplug.dev
 
 %if %{scsi_id}
 	%attr(755,root,root) /sbin/scsi_id
 	%config(noreplace) %attr(0644,root,root) /etc/scsi_id.config
 	%attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
 %endif
+%if %{volume_id}
+	%attr(755,root,root) /sbin/udev_volume_id
+%endif
 
 %changelog
+* Fri May 14 2004 Greg Kroah-Hartman <greg@kroah.com>
+- remove dbus and selinux stuff from here
+- added volume_id option
+
 * Wed Mar 24 2004 Greg Kroah-Hartman <greg@kroah.com>
 - change the way dbus and selinux support is built (now an extra)