Accepting request 556391 from Base:System

document systemd dependency during %post (forwarded request 556389 from seife)

OBS-URL: https://build.opensuse.org/request/show/556391
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=150
This commit is contained in:
Dominique Leuenberger 2017-12-15 12:59:41 +00:00 committed by Git OBS Bridge
commit 9837e84632
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From b912306ae756eaf75caa1ab7e04e3112fac4a01c Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife+dev@b1-systems.com>
Date: Mon, 11 Dec 2017 22:52:28 +0100
Subject: [PATCH] obexd: use AM_LDFLAGS for linking
without this, --enable-pie does not work for obexd
---
Makefile.obexd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.obexd b/Makefile.obexd
index 2e33cbc72..86c395305 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -83,7 +83,7 @@ obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
gdbus/libgdbus-internal.la \
@ICAL_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ -ldl
-obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic
+obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic
obexd_src_obexd_CFLAGS = $(AM_CFLAGS) @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
@ICAL_CFLAGS@ -DOBEX_PLUGIN_BUILTIN \
--
2.15.1

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 12 08:23:07 UTC 2017 - seife+obs@b1-systems.com
- add 0001-obexd-use-AM_LDFLAGS-for-linking.patch
- document systemd dependency during %post
-------------------------------------------------------------------
Sun Sep 17 22:34:07 UTC 2017 - seife+obs@b1-systems.com

View File

@ -34,6 +34,8 @@ Patch2: bluez-sdp-unix-path.patch
Patch3: bluez-cups-libexec.patch
# workaround for broken tests (reported upstream but not yet fixed)
Patch4: bluez-5.45-disable-broken-tests.diff
# PATCH-FIX-UPSTREAM: obexd not compiled with -fpie -- seife+obs@b1-systems.com
Patch5: 0001-obexd-use-AM_LDFLAGS-for-linking.patch
BuildRequires: automake
BuildRequires: flex
BuildRequires: libtool
@ -51,6 +53,7 @@ BuildRequires: pkgconfig(libical)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(udev)
Requires(post): systemd
Recommends: sbc
Provides: bluez-utils = 3.36
Obsoletes: bluez-utils <= 3.36
@ -136,6 +139,7 @@ desktop specific applets like blueman or GNOME or KDE applets).
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
mkdir dbus-apis
cp -a doc/*.txt dbus-apis/
# FIXME: Change the dbus service to be a real service, not systemd launched