From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Fri, 21 May 2010 10:19:21 +0000 (+0000)
Subject: - without_X11 bcond added as a workaround for X11-dependent dbus-launch in the
X-Git-Tag: auto/th/dbus-1_2_24-5~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=4c6c017abb6acf73da633174b63e9a4fe11d9ea7;p=packages%2Fdbus.git

- 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 fefe977..4667f08 100644
--- 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