summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2004-03-24 21:42:40 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:35:11 -0700
commit6fb7313bad16334c4b7bc742ee8cc9416ed1d78e (patch)
treeef5ce8b4b262f516a8d8b06c7c723e8a4d14b4e9
parent886069394932f45b43d400289c2761600aa0727b (diff)
[PATCH] fix dbus build in the udev.spec file.
-rw-r--r--udev.spec29
1 files changed, 14 insertions, 15 deletions
diff --git a/udev.spec b/udev.spec
index 017affbc36..a0cd75a608 100644
--- a/udev.spec
+++ b/udev.spec
@@ -11,11 +11,6 @@
# 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.
-# 0 - no DBUS support
-# 1 - DBUS support
-%define dbus 0
-
# if we want to build SELinux support in or not.
# 0 - no SELinux support
# 1 - SELinux support
@@ -27,6 +22,11 @@
# 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 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 %{dbus}
- USE_DBUS=true \
-%else
- USE_DBUS=false \
-%endif
%if %{selinux}
USE_SELINUX=true \
%else
@@ -81,15 +76,13 @@ make CC="gcc $RPM_OPT_FLAGS" \
%if %{scsi_id}
extras/scsi_id \
%endif
+%if %{dbus}
+ extras/dbus \
+%endif
"
%install
make DESTDIR=$RPM_BUILD_ROOT install \
-%if %{dbus}
- USE_DBUS=true \
-%else
- USE_DBUS=false \
-%endif
%if %{selinux}
USE_SELINUX=true \
%else
@@ -99,6 +92,9 @@ make DESTDIR=$RPM_BUILD_ROOT install \
%if %{scsi_id}
extras/scsi_id \
%endif
+%if %{dbus}
+ extras/dbus \
+%endif
"
%post
@@ -143,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Mar 24 2004 Greg Kroah-Hartman <greg@kroah.com>
+- change the way dbus 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