packages: dbus/dbus.spec - without_X11 bcond added as a workaround for X11-...

[jajcus]

Author: jajcus                       Date: Fri May 21 10:19:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- without_X11 bcond added as a workaround for X11-dependent dbus-launch in the
  main package (why the hell was the X11 subpackage dropped?)

---- Files affected:
packages/dbus:
   dbus.spec (1.202 -> 1.203) 

---- Diffs:

================================================================
Index: packages/dbus/dbus.spec
diff -u packages/dbus/dbus.spec:1.202 packages/dbus/dbus.spec:1.203
--- packages/dbus/dbus.spec:1.202	Thu May 13 14:17:09 2010
+++ packages/dbus/dbus.spec	Fri May 21 12:19:21 2010
@@ -2,6 +2,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
@@ -35,7 +36,7 @@
 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
@@ -149,7 +150,8 @@
 	--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
@@ -284,6 +286,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.203  2010/05/21 10:19:21  jajcus
+- without_X11 bcond added as a workaround for X11-dependent dbus-launch in the
+  main package (why the hell was the X11 subpackage dropped?)
+
 Revision 1.202  2010/05/13 12:17:09  jajcus
 - 'start on' fixed in the upstart file (there is no SERVICE=syslog-ng and
   syslog is not even required or used much by dbus-daemon)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/dbus.spec?r1=1.202&r2=1.203&f=u