X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dbus.spec;h=4a5d920c15c02d15a86da51942735ee8b8c1bc88;hb=refs%2Ftags%2Fauto%2Fth%2Fdbus-1_4_6-1;hp=ac64a6dc752b392a28c9c2d920d1080eb3cab342;hpb=b34aed3847c11a49ba606aa1fdfb8d5cf3abfe3d;p=packages%2Fdbus.git

diff --git a/dbus.spec b/dbus.spec
index ac64a6d..4a5d920 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -1,21 +1,23 @@
 #
 # 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.20
+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:	63f4e2412f6599a5e7b10281b9ddc0ac
+# Source0-md5:	99b165f727dd8a5c4b7e2c20a8bf5db6
 Source1:	messagebus.init
 Source2:	%{name}-daemon-1-profile.d-sh
 Source3:	%{name}-sysconfig
 Source4:	%{name}-xinitrc.sh
+Source5:	messagebus.upstart
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-no_fatal_checks.patch
@@ -30,10 +32,10 @@ BuildRequires:	libcap-ng-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.268
+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
@@ -45,7 +47,7 @@ Requires(pre):	/usr/sbin/useradd
 Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	expat >= %{expat_version}
-Requires:	rc-scripts >= 0.4.1.23
+Requires:	rc-scripts >= 0.4.1.26
 Provides:	group(messagebus)
 Provides:	user(messagebus)
 Obsoletes:	dbus-X11
@@ -65,6 +67,19 @@ D-BUS to system przesyłania komunikatów pomiędzy aplikacjami. Jest
 używany zarówno jako ogólnosystemowa usługa magistrali komunikatów jak
 i możliwość przesyłania komunikatów w ramach jednej sesji użytkownika.
 
+%package upstart
+Summary:	Upstart job description for system message bus
+Summary(pl.UTF-8):	Opis zadania Upstart dla magistrali systemowej DBus
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	upstart >= 0.6
+
+%description upstart
+Upstart job description for system message bus.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla magistrali systemowej DBus.
+
 %package dirs
 Summary:	D-BUS directories
 Summary(pl.UTF-8):	Katalogi D-BUS
@@ -120,12 +135,13 @@ Statyczna biblioteka D-BUS.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
 	%{?debug:--enable-verbose-mode} \
+	--disable-silent-rules \
 	--disable-asserts \
 	--disable-tests \
 	--enable-abstract-sockets=auto \
@@ -133,12 +149,13 @@ 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
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d} \
+install -d $RPM_BUILD_ROOT/etc/{init,profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d} \
 	$RPM_BUILD_ROOT%{_datadir}/dbus-1/{services,interfaces} \
 	$RPM_BUILD_ROOT%{_localstatedir}/run/dbus \
 	$RPM_BUILD_ROOT/%{_lib}
@@ -150,6 +167,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/init/messagebus.conf
 
 # upstart (/sbin/init) requires libdbus so it must be in /lib(64)
 mv -f $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so.* $RPM_BUILD_ROOT/%{_lib}
@@ -179,6 +197,14 @@ 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
 
@@ -225,6 +251,12 @@ 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)
 %dir %{_sysconfdir}/dbus-1