pool/dbus-1
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 87487 from Base:System

Browse Source 
- add patch to enable X11 autolaunch even if configure thinks
  it can't be done (bnc#707817)

OBS-URL: https://build.opensuse.org/request/show/87487
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=76
This commit is contained in:
Lars Vogdt 2011-10-12 14:11:25 +00:00 committed by Git OBS Bridge
commit 8d7ca86a05
8 changed files with 80 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dbus-1-x11.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Oct 12 09:47:55 UTC 2011 - coolo@suse.com
- add patch to enable X11 autolaunch even if configure thinks
it can't be done (bnc#707817)
-------------------------------------------------------------------
Wed Oct 12 00:32:50 CEST 2011 - dmueller@suse.de
- update to version 1.5.8:
* Clean up dead code, and make more warnings fatal in development builds
(fd.o #39231, fd.o #41012; Simon McVittie)
* Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie)
* Add _DBUS_STATIC_ASSERT and use it to check invariants
* Fix a small memory leak, and a failure to report errors, when updating
a service file entry for activation (fd.o #39230, Simon McVittie)
* Clean up (non-abstract) Unix sockets on bus daemon exit
* On systems that use libcap-ng but not systemd, drop supplemental groups
when switching to the daemon user (Red Hat #726953, Steve Grubb)
-------------------------------------------------------------------
Fri Sep 30 20:07:53 UTC 2011 - coolo@suse.com
- add libtool as buildrequire to make the spec file more reliable
-------------------------------------------------------------------
Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de

11
dbus-1-x11.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: dbus-1-x11
@ -29,7 +30,7 @@ Summary: D-Bus Message Bus System
BuildRequires: doxygen libexpat-devel libzio pkg-config update-desktop-files
BuildRequires: audit-devel
BuildRequires: libtool
Version: 1.5.6
Version: 1.5.8
Release: 1
# bug437293
%ifarch ppc64
@ -42,6 +43,8 @@ Source2: dbus-1.desktop
Source3: dbus_at_console.ck
Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
%if 0%{?suse_version} > 1100
%bcond_without selinux
%else
@ -64,6 +67,7 @@ in this separate package so server systems need not install X.
# COMMON2-BEGIN
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%build
autoreconf -fi
@ -88,7 +92,7 @@ export V=1
%endif
--enable-libaudit \
--with-console-auth-dir=/var/run/dbus/at_console/ \
--with-systemdsystemunitdir=/lib/systemd/system
--with-systemdsystemunitdir=/lib/systemd/system
make %{?_smp_mflags}
doxygen -u && doxygen
./cleanup-man-pages.sh
@ -104,6 +108,9 @@ mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}
mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1
rm -rf $tdir
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%{_bindir}/dbus-launch

3
dbus-1.5.6.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a1a07a80e7dbd763ee869a80ccff4f01d0824b79af6c1821b84540cb9118e5a1
size 1894520

3
dbus-1.5.8.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e1cd5248562b5362e9a1ad8314459fe2f60ee3b9622ce0afd68cc9df8ae7c5e
size 1904708

20
dbus-1.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Wed Oct 12 09:47:55 UTC 2011 - coolo@suse.com
- add patch to enable X11 autolaunch even if configure thinks
it can't be done (bnc#707817)
-------------------------------------------------------------------
Wed Oct 12 00:32:50 CEST 2011 - dmueller@suse.de
- update to version 1.5.8:
* Clean up dead code, and make more warnings fatal in development builds
(fd.o #39231, fd.o #41012; Simon McVittie)
* Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie)
* Add _DBUS_STATIC_ASSERT and use it to check invariants
* Fix a small memory leak, and a failure to report errors, when updating
a service file entry for activation (fd.o #39230, Simon McVittie)
* Clean up (non-abstract) Unix sockets on bus daemon exit
* On systems that use libcap-ng but not systemd, drop supplemental groups
when switching to the daemon user (Red Hat #726953, Steve Grubb)
-------------------------------------------------------------------
Fri Sep 30 20:07:53 UTC 2011 - coolo@suse.com

7
dbus-1.spec
View File

@ -27,7 +27,7 @@ Summary: D-Bus Message Bus System
BuildRequires: doxygen libexpat-devel libzio pkg-config update-desktop-files
BuildRequires: audit-devel
BuildRequires: libtool
Version: 1.5.6
Version: 1.5.8
Release: 1
# bug437293
%ifarch ppc64
@ -40,6 +40,8 @@ Source2: dbus-1.desktop
Source3: dbus_at_console.ck
Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
%if 0%{?suse_version} > 1100
%bcond_without selinux
%else
@ -96,6 +98,7 @@ bus daemon).
# COMMON2-BEGIN
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%build
autoreconf -fi
@ -120,7 +123,7 @@ export V=1
%endif
--enable-libaudit \
--with-console-auth-dir=/var/run/dbus/at_console/ \
--with-systemdsystemunitdir=/lib/systemd/system
--with-systemdsystemunitdir=/lib/systemd/system
make %{?_smp_mflags}
doxygen -u && doxygen
./cleanup-man-pages.sh

17
dbus-do-autolaunch.patch Normal file
View File

@ -0,0 +1,17 @@
From: Stephan Kulow <coolo@suse.de>
We want x11 autolaunch even if we have no x11 in the build environment
Index: dbus-1.5.8/dbus/dbus-sysdeps-unix.c
===================================================================
--- dbus-1.5.8.orig/dbus/dbus-sysdeps-unix.c 2011-09-21 19:20:06.000000000 +0200
+++ dbus-1.5.8/dbus/dbus-sysdeps-unix.c 2011-10-12 11:39:26.099779864 +0200
@@ -3339,7 +3339,7 @@ _dbus_get_autolaunch_address (const char
DBusString *address,
DBusError *error)
{
-#ifdef DBUS_ENABLE_X11_AUTOLAUNCH
+#if 1
/* Perform X11-based autolaunch. (We also support launchd-based autolaunch,
* but that's done elsewhere, and if it worked, this function wouldn't
* be called.) */

1
pre_checkin.sh
View File

@ -19,3 +19,4 @@ for spec in dbus-1-x11.spec; do
#fi
done
osc service localrun format_spec_file