From 5b300a21af42497bb7b02a98fc80df079ddfd60c Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 16 Nov 2012 09:26:26 -0800 Subject: [PATCH] Fixed package splitting split dbus-x11 correctly --- packaging/dbus-x11.spec | 28 +++++++++++++++------------- packaging/dbus-x11.spec.in | 21 +-------------------- packaging/dbus.spec | 2 +- packaging/pre_checkin.sh | 3 +-- 4 files changed, 18 insertions(+), 36 deletions(-) diff --git a/packaging/dbus-x11.spec b/packaging/dbus-x11.spec index 88fe913..2f12a60 100644 --- a/packaging/dbus-x11.spec +++ b/packaging/dbus-x11.spec @@ -1,16 +1,16 @@ 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 @@ -23,10 +23,12 @@ BuildRequires: pkgconfig(libsystemd-login) %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 @@ -38,7 +40,9 @@ in this separate package so server systems need not install X. %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 @@ -53,9 +57,9 @@ export V=1 %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 \ @@ -63,10 +67,8 @@ export V=1 --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 @@ -75,7 +77,7 @@ tdir=$(mktemp -d) 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 diff --git a/packaging/dbus-x11.spec.in b/packaging/dbus-x11.spec.in index 90d9f1e..48f10b5 100644 --- a/packaging/dbus-x11.spec.in +++ b/packaging/dbus-x11.spec.in @@ -1,22 +1,3 @@ -# -# 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 @@ -38,7 +19,7 @@ tdir=$(mktemp -d) 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 diff --git a/packaging/dbus.spec b/packaging/dbus.spec index 64fb4d6..7e39082 100644 --- a/packaging/dbus.spec +++ b/packaging/dbus.spec @@ -23,7 +23,7 @@ BuildRequires: pkgconfig(libsystemd-login) %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 diff --git a/packaging/pre_checkin.sh b/packaging/pre_checkin.sh index c785089..9f29cb9 100644 --- a/packaging/pre_checkin.sh +++ b/packaging/pre_checkin.sh @@ -2,7 +2,7 @@ # vim:sw=4 et # This script is called automatically during autobuild checkin. -cp -lf dbus.changes dbus-x11.changes +#cp -lf dbus.changes dbus-x11.changes for spec in dbus-x11.spec; do cp -f $spec.in $spec @@ -19,4 +19,3 @@ for spec in dbus-x11.spec; do #fi done -osc service localrun format_spec_file -- 2.7.4