- updated to 1.4.6

[packages/dbus.git] / dbus.spec

diff --git a/dbus.spec b/dbus.spec
index 18b4a36d3fa9d4f17fa69a53f3bcda383b1362fb..4a5d920c15c02d15a86da51942735ee8b8c1bc88 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -1,17 +1,18 @@
 #
 # 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
 Summary(pl.UTF-8):     Magistrala przesyłania komunikatów D-BUS
 Name:          dbus
-Version:       1.2.24
-Release:       3
+Version:       1.4.6
+Release:       1
 License:       AFL v2.1 or GPL v2
 Group:         Libraries
 Source0:       http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-# Source0-md5: 565346cecd9cfecf1463540c6086cc2c
+# Source0-md5: 99b165f727dd8a5c4b7e2c20a8bf5db6
 Source1:       messagebus.init
 Source2:       %{name}-daemon-1-profile.d-sh
 Source3:       %{name}-sysconfig
@@ -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
@@ -134,7 +135,7 @@ Statyczna biblioteka D-BUS.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -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
@@ -195,11 +197,13 @@ if [ "$1" = "0" ]; then
        %groupremove messagebus
 fi
 
+%if 0
 %post upstart
 %upstart_post messagebus
 
 %postun upstart
 %upstart_postun messagebus
+%endif
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
@@ -247,9 +251,11 @@ fi
 %{_mandir}/man1/dbus-monitor.1*
 %{_mandir}/man1/dbus-send.1*
 
+%if "%{pld_release}" != "ti"
 %files upstart
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/init/messagebus.conf
+%endif
 
 %files dirs
 %defattr(644,root,root,755)