Backport cooker fixes

This commit is contained in:
Denis Silakov 2013-02-28 15:49:54 +04:00
parent ea9dd811c4
commit 236ea94dac
2 changed files with 17 additions and 6 deletions

View file

@ -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])])

View file

@ -7,7 +7,7 @@
Name: bluez Name: bluez
Summary: Official Linux Bluetooth protocol stack Summary: Official Linux Bluetooth protocol stack
Version: 4.101 Version: 4.101
Release: 4 Release: 6
License: GPLv2+ License: GPLv2+
Group: Communications Group: Communications
URL: http://www.bluez.org/ URL: http://www.bluez.org/
@ -20,7 +20,7 @@ Source10: bluez-uinput.modules
# http://thread.gmane.org/gmane.linux.bluez.kernel/8645 # http://thread.gmane.org/gmane.linux.bluez.kernel/8645
Patch0: 0002-systemd-unitdir-enable.patch Patch0: 0002-systemd-unitdir-enable.patch
Patch1: bluez-4.101-automake-1.13.patch
Patch4: bluez-socket-mobile-cf-connection-kit.patch Patch4: bluez-socket-mobile-cf-connection-kit.patch
# http://thread.gmane.org/gmane.linux.bluez.kernel/2396 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
@ -32,7 +32,7 @@ Patch9: bluez-4.101-fix-c++11-compatibility.patch
BuildRequires: flex BuildRequires: flex
BuildRequires: bison BuildRequires: bison
Buildrequires: systemd BuildRequires: systemd
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: expat-devel BuildRequires: expat-devel
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
@ -41,7 +41,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(libcap-ng) BuildRequires: pkgconfig(libcap-ng)
BuildRequires: pkgconfig(libusb) BuildRequires: pkgconfig(libusb)
BuildRequires: usb1-devel BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(udev) >= 186 BuildRequires: pkgconfig(udev) >= 186
Requires: bluez-pin Requires: bluez-pin
@ -97,7 +97,7 @@ fi
/bin/hidd /bin/hidd
/sbin/bluetoothd /sbin/bluetoothd
%if %{with systemd} %if %{with systemd}
/lib/systemd/system/*.service %{_unitdir}/*.service
%endif %endif
%{_mandir}/man?/* %{_mandir}/man?/*
%config(noreplace) %{_sysconfdir}/sysconfig/* %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 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 %changelog