[bluez] Update systemd patch to apply
Bastien Nocera
hadess at fedoraproject.org
Fri Jun 3 11:17:02 UTC 2011
commit db49d013637c9f9fb182ff31d99b74310c22024e
Author: Bastien Nocera <hadess at hadess.net>
Date: Fri Jun 3 12:16:49 2011 +0100
Update systemd patch to apply
0001-systemd-install-systemd-unit-files.patch | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/0001-systemd-install-systemd-unit-files.patch b/0001-systemd-install-systemd-unit-files.patch
index 91164cf..5fadde8 100644
--- a/0001-systemd-install-systemd-unit-files.patch
+++ b/0001-systemd-install-systemd-unit-files.patch
@@ -1,4 +1,4 @@
-From 22c938523708fab4afa67608461c103a663fd21c Mon Sep 17 00:00:00 2001
+From c4b7096f8643d23111f91c60cbd2a62883d419ba Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Wed, 21 Jul 2010 19:20:44 +0200
Subject: [PATCH] systemd: install systemd unit files
@@ -18,7 +18,7 @@ that bluetoothd is not started twice at the same time.
create mode 100644 scripts/org.bluez.service
diff --git a/Makefile.am b/Makefile.am
-index 4670886..8a844bf 100644
+index 4659c80..c2a6976 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -352,7 +352,8 @@ endif
@@ -30,8 +30,8 @@ index 4670886..8a844bf 100644
+ scripts/bluetooth.service.in scripts/org.bluez.service
if PCMCIA
- udevdir = $(libexecdir)/udev
-@@ -360,6 +361,20 @@ udevdir = $(libexecdir)/udev
+ udevdir = @UDEV_DIR@
+@@ -360,6 +361,20 @@ udevdir = @UDEV_DIR@
dist_udev_SCRIPTS = scripts/bluetooth_serial
endif
@@ -56,8 +56,8 @@ index 4670886..8a844bf 100644
pkgconfig_DATA = bluez.pc
--DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib
-+DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib --with-systemdsystemunitdir=
+-DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules
++DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --with-systemdsystemunitdir=
-DISTCLEANFILES = $(pkgconfig_DATA)
+DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service
@@ -65,10 +65,10 @@ index 4670886..8a844bf 100644
MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 configure config.h.in config.sub config.guess \
diff --git a/configure.ac b/configure.ac
-index 1ecdc7b..ddb62ed 100644
+index 2ce4acf..07b9e55 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -56,5 +56,14 @@ if (test "${enable_capng}" = "yes"); then
+@@ -57,5 +57,14 @@ if (test "${enable_capng}" = "yes"); then
AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
fi
@@ -121,5 +121,5 @@ index 0000000..dd7ae8f
+User=root
+SystemdService=dbus-org.bluez.service
--
-1.7.4.1
+1.7.5.1
More information about the scm-commits
mailing list