X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.spec;h=cacaf2868a1758a5ff5e8653936b2a8f7518e1b8;hp=a0cd75a608600a727e55c836e3e0250ebe9408f6;hb=f2bd44417bf2c6c99037b430f3f97cfd65a21f76;hpb=6fb7313bad16334c4b7bc742ee8cc9416ed1d78e

diff --git a/udev.spec b/udev.spec
index a0cd75a60..cacaf2868 100644
--- a/udev.spec
+++ b/udev.spec
@@ -11,22 +11,22 @@
 # Note, it is not recommend if you use klibc to enable logging.
 %define log 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 build the DBUS "extra package or not
+# 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
@@ -34,7 +34,7 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 022_bk
+Version: 024
 Release: 1
 License: GPL
 Group: Utilities/System
@@ -62,11 +62,6 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 %else
 	USE_LOG=false		\
 %endif
-%if %{selinux}
-	USE_SELINUX=true	\
-%else
-	USE_SELINUX=false	\
-%endif
 %if %{debug}
 	DEBUG=true		\
 %else
@@ -79,15 +74,13 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 %if %{dbus}
 	extras/dbus	\
 %endif
+%if %{selinux}
+	extras/selinux	\
+%endif
 "
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install \
-%if %{selinux}
-	USE_SELINUX=true	\
-%else
-	USE_SELINUX=false	\
-%endif
 	EXTRAS="	\
 %if %{scsi_id}
 	extras/scsi_id	\
@@ -95,6 +88,9 @@ make DESTDIR=$RPM_BUILD_ROOT install \
 %if %{dbus}
 	extras/dbus	\
 %endif
+%if %{selinux}
+	extras/selinux	\
+%endif
 "
 
 %post
@@ -117,7 +113,7 @@ 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/
@@ -140,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Mar 24 2004 Greg Kroah-Hartman <greg@kroah.com>
-- change the way dbus support is built (now an extra)
+- change the way dbus and selinux support is built (now an extra)
 
 * Tue Mar 2 2004 Greg Kroah-Hartman <greg@kroah.com>
 - added udevstart to the list of files installed