Name: dbus-x11
%define _name dbus
-BuildRequires: pkgconfig(x11)
+BuildRequires: xorg-x11-devel
Url: http://dbus.freedesktop.org/
-Summary: D-Bus Message Bus System
-License: GPL-2.0+ or AFL-2.1
+License: GPL2+ or AFL 2.1
Group: System/Daemons
+Summary: D-Bus Message Bus System
# COMMON1-BEGIN
# COMMON1-BEGIN
# We can't enable this right now, because it will create a build cycle between
# dbus-1 and systemd. Fun!
-%define with_systemd 0
+%define with_systemd 1
BuildRequires: doxygen
BuildRequires: expat-devel
%endif
Version: 1.6.8
Release: 0
-Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
+Source0: http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
Source1: rc.boot.dbus
Source3: dbus_at_console.ck
Source4: baselibs.conf
+# Patches auto-generated by git-buildpackage:
+Patch0: 0001-fix-sba-for-dbus-activation.patch
BuildRequires: libcap-ng-devel
# COMMON1-END
# COMMON1-END
%prep
# COMMON2-BEGIN
# COMMON2-BEGIN
-%setup -n %{_name}-%{version} -q
+%setup -n %{name}-%{version} -q
+# 0001-fix-sba-for-dbus-activation.patch
+%patch0 -p1
%build
autoreconf -fi
%configure \
--disable-static \
--with-pic \
- --bindir=/bin \
- --libexecdir=/lib/%{name} \
- --libdir=/%{_lib} \
+ --with-dbus-user=dbus \
+ --libexecdir=%{_libdir}/%{name} \
+ --libdir=%{_libdir} \
--with-init-scripts=suse \
--enable-inotify \
--enable-doxygen-docs \
--enable-systemd \
%endif
--with-console-auth-dir=/var/run/dbus/at_console/ \
- --with-systemdsystemunitdir=/lib/systemd/system
+ --with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
-doxygen -u && doxygen
-./cleanup-man-pages.sh
%install
# COMMON2-END
make DESTDIR=$tdir install
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_mandir}/man1
-mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}
+mv $tdir/%{_bindir}/dbus-launch %{buildroot}/%{_bindir}
mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1
rm -rf $tdir
-#
-# spec file for package dbus-1-x11 (Version 1.4.1)
-#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
Name: dbus-x11
%define _name dbus
BuildRequires: xorg-x11-devel
make DESTDIR=$tdir install
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_mandir}/man1
-mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}
+mv $tdir/%{_bindir}/dbus-launch %{buildroot}/%{_bindir}
mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1
rm -rf $tdir