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

diff --git a/udev.spec b/udev.spec
index 9ead61918..a0cd75a60 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
@@ -34,7 +34,7 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 021
+Version: 022_bk
 Release: 1
 License: GPL
 Group: Utilities/System
@@ -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
@@ -114,7 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING README TODO ChangeLog HOWTO* etc/udev/udev.rules.examples docs/*
+%doc COPYING README TODO ChangeLog HOWTO* docs/*
+%doc etc/udev/udev.rules.{examples,gentoo,redhat}
+%doc etc/udev/udev.permissions.{gentoo,redhat}
 %attr(755,root,root) /sbin/udev
 %attr(755,root,root) /usr/bin/udevinfo
 %attr(755,root,root) /sbin/udevsend
@@ -141,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