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

diff --git a/udev.spec b/udev.spec
index f183f5b3d..79b695241 100644
--- a/udev.spec
+++ b/udev.spec
@@ -17,21 +17,16 @@
 # 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: 025
@@ -71,11 +66,8 @@ 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
 "
 
@@ -85,11 +77,8 @@ make DESTDIR=$RPM_BUILD_ROOT install \
 %if %{scsi_id}
 	extras/scsi_id	\
 %endif
-%if %{dbus}
-	extras/dbus	\
-%endif
-%if %{selinux}
-	extras/selinux	\
+%if %{volume_id}
+	extras/volume_id	\
 %endif
 "
 
@@ -124,17 +113,20 @@ rm -rf $RPM_BUILD_ROOT
 %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
-
 %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)