From: greg@kroah.com <greg@kroah.com>
Date: Thu, 25 Mar 2004 06:49:03 +0000 (-0800)
Subject: [PATCH] fixed up udev.spec to handle selinux stuff properly now.
X-Git-Tag: 023~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b658bc09a1ae34f57d7719ecad74caf571d5cdf8;p=systemd

[PATCH] fixed up udev.spec to handle selinux stuff properly now.
---

diff --git a/udev.spec b/udev.spec
index a0cd75a6..8e6c16d6 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
@@ -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
@@ -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