X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.spec;h=b7e429d077e353a42720ed72644970a0ed21b0dd;hb=d5f91372dd3241f8b4bbe2a99aaaeda541a76bad;hp=63d1835a4a0e9d8d413bd5901a0604ef75269e88;hpb=d54fe24caa38ffc6e5dee7ef5cdcb3c24a882bf8;p=elogind.git

diff --git a/udev.spec b/udev.spec
index 63d1835a4..b7e429d07 100644
--- a/udev.spec
+++ b/udev.spec
@@ -16,17 +16,17 @@
 # 1 - DBUS support
 %define dbus 0
 
+# if we want to build SELinux support in or not.
+# 0 - no SELinux support
+# 1 - SELinux support
+%define selinux 0
+
 # if we want to enable debugging support in udev.  If it is enabled, lots of 
 # stuff will get sent to the debug syslog.
 # 0 - debugging disabled
 # 1 - debugging enabled
 %define debug 0
 
-# if we want to use the LSB version of the init script or the Redhat one
-# 0 - use Redhat: etc/init.d/udev
-# 1 - use LSB: etc/init.d/udev.init.LSB
-%define lsb 0
-
 # if we want to build the scsi_id "extra" package or not
 # 0 - do not build the package
 # 1 - build it
@@ -34,7 +34,7 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 018_bk
+Version: 021_bk
 Release: 1
 License: GPL
 Group: Utilities/System
@@ -67,6 +67,11 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 %else
 	USE_DBUS=false		\
 %endif
+%if %{selinux}
+	USE_SELINUX=true	\
+%else
+	USE_SELINUX=false	\
+%endif
 %if %{debug}
 	DEBUG=true		\
 %else
@@ -85,10 +90,10 @@ make DESTDIR=$RPM_BUILD_ROOT install \
 %else
 	USE_DBUS=false		\
 %endif
-%if %{lsb}
-	USE_LSB=true		\
+%if %{selinux}
+	USE_SELINUX=true	\
 %else
-	USE_LSB=false		\
+	USE_SELINUX=false	\
 %endif
 	EXTRAS="	\
 %if %{scsi_id}
@@ -111,10 +116,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc COPYING README TODO ChangeLog HOWTO* etc/udev/udev.rules.examples docs/*
 %attr(755,root,root) /sbin/udev
-%attr(755,root,root) /sbin/udevinfo
+%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) /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
@@ -135,6 +141,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Mar 2 2004 Greg Kroah-Hartman <greg@kroah.com>
+- added udevstart to the list of files installed
+- udevinfo is now in /usr/bin not /sbin
+
+* Fri Feb 27 2004 Greg Kroah-Hartman <greg@kroah.com>
+- added ability to build with SELinux support
+
 * Thu Feb 19 2004 Greg Kroah-Hartman <greg@kroah.com>
 - add some more files to the documentation directory
 - add ability to build scsi_id and make it the default