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

Accepting request 202587 from Base:System

Browse Source 
BLUEZ 5 => WANTED for 13.1

- Do not package systemd user session service file.
- Change DBus user service to be self-contained, and not rely on
  Systemd activation (bnc#842688). (forwarded request 202586 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/202587
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=112
This commit is contained in:
Tomáš Chvátal 2013-10-08 10:50:34 +00:00 committed by Git OBS Bridge
commit 8ae7dbb0bd
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bluez.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 8 08:24:15 UTC 2013 - dimstar@opensuse.org
- Do not package systemd user session service file.
- Change DBus user service to be self-contained, and not rely on
Systemd activation (bnc#842688).
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 14 08:01:17 UTC 2013 - crrodriguez@opensuse.org Sat Sep 14 08:01:17 UTC 2013 - crrodriguez@opensuse.org

10
bluez.spec
View File

@ -18,6 +18,7 @@
Name: bluez Name: bluez
# FIXME: Do not mangle dbus service / systemd service once we support systemd user services
BuildRequires: flex BuildRequires: flex
BuildRequires: libcap-ng-devel BuildRequires: libcap-ng-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
@ -118,6 +119,10 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
cp %{SOURCE6} . cp %{SOURCE6} .
mkdir dbus-apis mkdir dbus-apis
cp -a doc/*.txt dbus-apis/ cp -a doc/*.txt dbus-apis/
# FIXME: Change the dbus service to be a real service, not systemd launched
sed -i "s:Exec=/bin/false:Exec=%{_libexecdir}/bluetooth/obexd:g" obexd/src/org.bluez.obex.service
sed -i "/SystemdService=.*/d" obexd/src/org.bluez.obex.service
# END FIXME
%build %build
# autoreconf -fiv # autoreconf -fiv
@ -148,6 +153,10 @@ fi
# no idea why this is suddenly necessary... # no idea why this is suddenly necessary...
install --mode 0755 -d %{buildroot}%{_localstatedir}/lib/bluetooth install --mode 0755 -d %{buildroot}%{_localstatedir}/lib/bluetooth
# FIXME: Do not delete the systemd service once we support systemd user/session services
rm %{buildroot}%{_prefix}/lib/systemd/user/obex.service
# end FIXME
%check %check
%if ! 0%{?qemu_user_space_build} %if ! 0%{?qemu_user_space_build}
make check make check
@ -214,7 +223,6 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/modprobe.d %dir %{_sysconfdir}/modprobe.d
%config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf %config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf
%{_unitdir}/bluetooth.service %{_unitdir}/bluetooth.service
/usr/lib/systemd/user/obex.service
%{_datadir}/dbus-1/system-services/org.bluez.service %{_datadir}/dbus-1/system-services/org.bluez.service
%{_datadir}/dbus-1/services/org.bluez.obex.service %{_datadir}/dbus-1/services/org.bluez.obex.service