- without_X11 bcond added as a workaround for X11-dependent dbus-launch in the

  main package (why the hell was the X11 subpackage dropped?)

Changed files:
    dbus.spec -> 1.203

diff --git a/dbus.spec b/dbus.spec
index fefe977482ef2084b3d0a3cf3832e1df78705ebc..4667f08b4ecc475245b504fbf375068e4fd539ef 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_without selinux         # build without SELinux support
+%bcond_without X11             # build without X11 support
 
 %define                expat_version   1:1.95.5
 Summary:       D-BUS message bus
@@ -34,7 +35,7 @@ BuildRequires:        pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.561
 BuildRequires: sed >= 4.0
 BuildRequires: xmlto
-BuildRequires: xorg-lib-libX11-devel
+%{?with_X11:BuildRequires:     xorg-lib-libX11-devel}
 Requires(post,postun): /sbin/ldconfig
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
@@ -148,7 +149,8 @@ Statyczna biblioteka D-BUS.
        --with-console-auth-dir=%{_localstatedir}/run/console/ \
        --with-session-socket-dir=/tmp \
        --with-system-pid-file=%{_localstatedir}/run/dbus.pid \
-       --with-xml=expat
+       --with-xml=expat \
+       %{!?with_X11:--without-x}
 %{__make}
 
 %install