[PATCH] fix dbus build in the udev.spec file.

This commit is contained in:
greg@kroah.com 2004-03-24 21:42:40 -08:00 committed by Greg KH
parent 8860693949
commit 6fb7313bad

View file

@ -11,11 +11,6 @@
# Note, it is not recommend if you use klibc to enable logging. # Note, it is not recommend if you use klibc to enable logging.
%define log 0 %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. # if we want to build SELinux support in or not.
# 0 - no SELinux support # 0 - no SELinux support
# 1 - SELinux support # 1 - SELinux support
@ -27,6 +22,11 @@
# 1 - debugging enabled # 1 - debugging enabled
%define debug 0 %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 # if we want to build the scsi_id "extra" package or not
# 0 - do not build the package # 0 - do not build the package
# 1 - build it # 1 - build it
@ -62,11 +62,6 @@ make CC="gcc $RPM_OPT_FLAGS" \
%else %else
USE_LOG=false \ USE_LOG=false \
%endif %endif
%if %{dbus}
USE_DBUS=true \
%else
USE_DBUS=false \
%endif
%if %{selinux} %if %{selinux}
USE_SELINUX=true \ USE_SELINUX=true \
%else %else
@ -81,15 +76,13 @@ make CC="gcc $RPM_OPT_FLAGS" \
%if %{scsi_id} %if %{scsi_id}
extras/scsi_id \ extras/scsi_id \
%endif %endif
%if %{dbus}
extras/dbus \
%endif
" "
%install %install
make DESTDIR=$RPM_BUILD_ROOT install \ make DESTDIR=$RPM_BUILD_ROOT install \
%if %{dbus}
USE_DBUS=true \
%else
USE_DBUS=false \
%endif
%if %{selinux} %if %{selinux}
USE_SELINUX=true \ USE_SELINUX=true \
%else %else
@ -99,6 +92,9 @@ make DESTDIR=$RPM_BUILD_ROOT install \
%if %{scsi_id} %if %{scsi_id}
extras/scsi_id \ extras/scsi_id \
%endif %endif
%if %{dbus}
extras/dbus \
%endif
" "
%post %post
@ -143,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %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> * Tue Mar 2 2004 Greg Kroah-Hartman <greg@kroah.com>
- added udevstart to the list of files installed - added udevstart to the list of files installed
- udevinfo is now in /usr/bin not /sbin - udevinfo is now in /usr/bin not /sbin