- release 2

[packages/dbus.git] / dbus.spec

diff --git a/dbus.spec b/dbus.spec
index 03291817c978beec2509bcae6f12a90ff1b40dfe..812a8f0af1670176152899e725794efb57c45637 100644 (file)
--- 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.24
-Release:       1
+Version:       1.4.0
+Release:       2
 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: f59618b18d2fb2bd1fce9e1c5a2a3282
 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
@@ -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
@@ -134,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}
@@ -151,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}
@@ -180,6 +197,12 @@ if [ "$1" = "0" ]; then
        %groupremove messagebus
 fi
 
+%post upstart
+%upstart_post messagebus
+
+%postun upstart
+%upstart_postun messagebus
+
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
@@ -226,6 +249,10 @@ fi
 %{_mandir}/man1/dbus-monitor.1*
 %{_mandir}/man1/dbus-send.1*
 
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/messagebus.conf
+
 %files dirs
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/dbus-1