From 236ea94dacce6fbe1fa4df102bc1016a6963ca38 Mon Sep 17 00:00:00 2001
From: Denis Silakov <denis.silakov@rosalab.ru>
Date: Thu, 28 Feb 2013 15:49:54 +0400
Subject: [PATCH] Backport cooker fixes

---
 bluez-4.101-automake-1.13.patch | 11 +++++++++++
 bluez.spec                      | 12 ++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 bluez-4.101-automake-1.13.patch

diff --git a/bluez-4.101-automake-1.13.patch b/bluez-4.101-automake-1.13.patch
new file mode 100644
index 0000000..16bd1cc
--- /dev/null
+++ b/bluez-4.101-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- bluez-4.101/configure.ac.bero	2013-01-15 18:49:07.755043126 +0100
++++ bluez-4.101/configure.ac	2013-01-15 18:49:15.743947380 +0100
+@@ -2,7 +2,7 @@ AC_PREREQ(2.60)
+ AC_INIT(bluez, 4.101)
+ 
+ AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/bluez.spec b/bluez.spec
index 13d116a..259e34e 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -7,7 +7,7 @@
 Name:		bluez
 Summary:	Official Linux Bluetooth protocol stack
 Version:	4.101
-Release:	4
+Release:	6
 License:	GPLv2+
 Group:		Communications
 URL:		http://www.bluez.org/
@@ -20,7 +20,7 @@ Source10:	bluez-uinput.modules
 
 # http://thread.gmane.org/gmane.linux.bluez.kernel/8645
 Patch0:		0002-systemd-unitdir-enable.patch
-
+Patch1:		bluez-4.101-automake-1.13.patch
 Patch4:		bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
 Patch5:		0001-Add-sixaxis-cable-pairing-plugin.patch
@@ -32,7 +32,7 @@ Patch9:		bluez-4.101-fix-c++11-compatibility.patch
 
 BuildRequires:	flex
 BuildRequires:	bison
-Buildrequires:	systemd
+BuildRequires:	systemd
 BuildRequires:	readline-devel
 BuildRequires:	expat-devel
 BuildRequires:	pkgconfig(alsa)
@@ -41,7 +41,7 @@ BuildRequires:	pkgconfig(gstreamer-plugins-base-0.10)
 BuildRequires:	pkgconfig(gstreamer-0.10)
 BuildRequires:	pkgconfig(libcap-ng)
 BuildRequires:	pkgconfig(libusb)
-BuildRequires:	usb1-devel
+BuildRequires:	pkgconfig(libusb-1.0)
 BuildRequires:	pkgconfig(udev) >= 186
 
 Requires:	bluez-pin
@@ -97,7 +97,7 @@ fi
 /bin/hidd
 /sbin/bluetoothd
 %if %{with systemd}
-/lib/systemd/system/*.service
+%{_unitdir}/*.service
 %endif
 %{_mandir}/man?/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
@@ -280,7 +280,7 @@ mv %{buildroot}/%{_lib}/alsa-lib/*.so %{buildroot}%{_libdir}/alsa-lib/
 
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/bluetooth
 
-ln -s bluetooth.service %buildroot/lib/systemd/system/dbus-org.bluez.service
+ln -s bluetooth.service %{buildroot}%{_unitdir}/dbus-org.bluez.service
 
 
 %changelog