X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.spec;h=1df59ecdb879155fda8c40e3d70f3ca5f3f79db9;hp=34e0755fda83def277d2466d7c6130ffd501f886;hb=c1f8ea9562765d920881d46aeac69cce554d7ce3;hpb=824e601185babc5daf3e1c28c487bb4bc5ea48e2

diff --git a/udev.spec b/udev.spec
index 34e0755fd..1df59ecdb 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 DBUS support in or not.
+# 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
 # 0 - no DBUS support
 # 1 - DBUS support
 %define dbus 0
 
-# if we want to build SELinux support in or not.
+# 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 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 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: 021_bk
+Version: 023_bk
 Release: 1
 License: GPL
 Group: Utilities/System
@@ -62,16 +62,6 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 %else
 	USE_LOG=false		\
 %endif
-%if %{dbus}
-	USE_DBUS=true		\
-%else
-	USE_DBUS=false		\
-%endif
-%if %{selinux}
-	USE_SELINUX=true	\
-%else
-	USE_SELINUX=false	\
-%endif
 %if %{debug}
 	DEBUG=true		\
 %else
@@ -81,24 +71,26 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 %if %{scsi_id}
 	extras/scsi_id	\
 %endif
-"
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install \
 %if %{dbus}
-	USE_DBUS=true		\
-%else
-	USE_DBUS=false		\
+	extras/dbus	\
 %endif
 %if %{selinux}
-	USE_SELINUX=true	\
-%else
-	USE_SELINUX=false	\
+	extras/selinux	\
 %endif
+"
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install \
 	EXTRAS="	\
 %if %{scsi_id}
 	extras/scsi_id	\
 %endif
+%if %{dbus}
+	extras/dbus	\
+%endif
+%if %{selinux}
+	extras/selinux	\
+%endif
 "
 
 %post
@@ -121,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/
@@ -143,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Mar 24 2004 Greg Kroah-Hartman <greg@kroah.com>
+- 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
 - udevinfo is now in /usr/bin not /sbin