mirror of
https://abf.rosa.ru/djam/bluez.git
synced 2025-02-23 15:12:52 +00:00
Automatic import for version 4.101-4
This commit is contained in:
Rosa
parent
5671d3d840
commit
620a22761e
2 changed files with 76 additions and 44 deletions
23
bluez-4.101-fix-c++11-compatibility.patch
Normal file
23
bluez-4.101-fix-c++11-compatibility.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
--- bluez-4.101/lib/bluetooth.h.c++11~ 2012-06-28 23:59:45.676069338 +0200
|
||||
+++ bluez-4.101/lib/bluetooth.h 2012-06-28 23:59:50.973003117 +0200
|
||||
@@ -140,16 +140,16 @@ enum {
|
||||
#define bt_get_unaligned(ptr) \
|
||||
({ \
|
||||
struct __attribute__((packed)) { \
|
||||
- typeof(*(ptr)) __v; \
|
||||
- } *__p = (typeof(__p)) (ptr); \
|
||||
+ __typeof__(*(ptr)) __v; \
|
||||
+ } *__p = (__typeof__(__p)) (ptr); \
|
||||
__p->__v; \
|
||||
})
|
||||
|
||||
#define bt_put_unaligned(val, ptr) \
|
||||
do { \
|
||||
struct __attribute__((packed)) { \
|
||||
- typeof(*(ptr)) __v; \
|
||||
- } *__p = (typeof(__p)) (ptr); \
|
||||
+ __typeof__(*(ptr)) __v; \
|
||||
+ } *__p = (__typeof__(__p)) (ptr); \
|
||||
__p->__v = (val); \
|
||||
} while(0)
|
||||
|
||||
97
bluez.spec
97
bluez.spec
|
|
@ -2,14 +2,15 @@
|
|||
%define libname %mklibname %{name} %{major}
|
||||
%define devname %mklibname -d %{name}
|
||||
|
||||
%define _with_systemd 1
|
||||
%bcond_without systemd
|
||||
|
||||
Name: bluez
|
||||
Summary: Official Linux Bluetooth protocol stack
|
||||
Version: 4.101
|
||||
Release: 2
|
||||
Release: 4
|
||||
License: GPLv2+
|
||||
Group: Communications
|
||||
URL: http://www.bluez.org/
|
||||
Source0: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
|
||||
Source6: pand.conf
|
||||
Source7: dund.conf
|
||||
|
|
@ -27,13 +28,12 @@ Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
|
|||
Patch6: 0001-input-Add-helper-function-to-request-disconnect.patch
|
||||
Patch7: 0002-fakehid-Disconnect-from-PS3-remote-after-10-mins.patch
|
||||
Patch8: 0003-fakehid-Use-the-same-constant-as-declared.patch
|
||||
|
||||
Patch9: bluez-4.101-fix-c++11-compatibility.patch
|
||||
|
||||
BuildRequires: flex
|
||||
BuildRequires: bison
|
||||
Buildrequires: systemd
|
||||
BuildRequires: readline
|
||||
BuildRequires: udev
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
|
|
@ -42,7 +42,7 @@ BuildRequires: pkgconfig(gstreamer-0.10)
|
|||
BuildRequires: pkgconfig(libcap-ng)
|
||||
BuildRequires: pkgconfig(libusb)
|
||||
BuildRequires: usb1-devel
|
||||
BuildRequires: pkgconfig(udev)
|
||||
BuildRequires: pkgconfig(udev) >= 186
|
||||
|
||||
Requires: bluez-pin
|
||||
Suggests: obex-data-server
|
||||
|
|
@ -71,7 +71,7 @@ fi
|
|||
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
/bin/systemctl try-restart bluetooth.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl try-restart bluetooth.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%triggerun -- bluez < 4.94-4
|
||||
|
|
@ -80,6 +80,7 @@ fi
|
|||
%files
|
||||
%{_bindir}/ciptool
|
||||
%{_bindir}/dfutool
|
||||
%{_bindir}/gatttool
|
||||
%{_bindir}/hcitool
|
||||
%{_bindir}/hidd
|
||||
%{_bindir}/l2ping
|
||||
|
|
@ -95,7 +96,7 @@ fi
|
|||
%{_sbindir}/bluetoothd
|
||||
/bin/hidd
|
||||
/sbin/bluetoothd
|
||||
%if %{_with_systemd}
|
||||
%if %{with systemd}
|
||||
/lib/systemd/system/*.service
|
||||
%endif
|
||||
%{_mandir}/man?/*
|
||||
|
|
@ -111,39 +112,39 @@ fi
|
|||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package cups
|
||||
Summary: CUPS printer backend for Bluetooth printers
|
||||
Group: System/Servers
|
||||
Requires: cups
|
||||
%package cups
|
||||
Summary: CUPS printer backend for Bluetooth printers
|
||||
Group: System/Servers
|
||||
Requires: cups
|
||||
|
||||
%description cups
|
||||
%description cups
|
||||
This package contains the CUPS backend for Bluetooth printers.
|
||||
|
||||
%files cups
|
||||
%files cups
|
||||
%{_prefix}/lib/cups/backend/bluetooth
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package gstreamer
|
||||
Summary: Gstreamer support for SBC audio format
|
||||
Group: Sound
|
||||
%package gstreamer
|
||||
Summary: Gstreamer support for SBC audio format
|
||||
Group: Sound
|
||||
|
||||
%description gstreamer
|
||||
%description gstreamer
|
||||
This package contains gstreamer plugins for the Bluetooth SBC audio format
|
||||
|
||||
%files gstreamer
|
||||
%files gstreamer
|
||||
%{_libdir}/gstreamer-*/*.so
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package alsa
|
||||
Summary: ALSA support for Bluetooth audio devices
|
||||
Group: Sound
|
||||
%package alsa
|
||||
Summary: ALSA support for Bluetooth audio devices
|
||||
Group: Sound
|
||||
|
||||
%description alsa
|
||||
%description alsa
|
||||
This package contains ALSA support for Bluetooth audio devices
|
||||
|
||||
%files alsa
|
||||
%files alsa
|
||||
%{_libdir}/alsa-lib/*.so
|
||||
%{_datadir}/alsa/bluetooth.conf
|
||||
|
||||
|
|
@ -161,17 +162,17 @@ These are the official Bluetooth communication libraries for Linux.
|
|||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package test
|
||||
%package test
|
||||
Summary: Tools for testing of various Bluetooth-functions
|
||||
Group: System/Servers
|
||||
Requires: python-dbus
|
||||
Requires: python-gobject
|
||||
|
||||
%description test
|
||||
%description test
|
||||
Contains a few tools for testing various bluetooth functions. The
|
||||
BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
|
||||
|
||||
%files test
|
||||
%files test
|
||||
%{_bindir}/simple-agent
|
||||
%{_bindir}/test-*
|
||||
|
||||
|
|
@ -187,7 +188,7 @@ Provides: %{name}-devel = %{version}-%{release}
|
|||
This package contains the headers that programmers will need to develop
|
||||
applications which will use libraries from %{name}.
|
||||
|
||||
%files -n %{devname}
|
||||
%files -n %{devname}
|
||||
%doc AUTHORS ChangeLog README
|
||||
%dir %{_includedir}/bluetooth
|
||||
%{_includedir}/bluetooth/*.h
|
||||
|
|
@ -200,15 +201,13 @@ applications which will use libraries from %{name}.
|
|||
%setup -q
|
||||
%apply_patches
|
||||
|
||||
%build
|
||||
libtoolize -f -c
|
||||
autoreconf -fi
|
||||
|
||||
# fix mdv bug 35444
|
||||
%define _localstatedir %{_var}
|
||||
%build
|
||||
%configure2_5x \
|
||||
--libdir=/%{_lib} \
|
||||
%if !%{_with_systemd}
|
||||
%if !%{with systemd}
|
||||
--without-systemdsystemunitdir \
|
||||
%endif
|
||||
--enable-cups \
|
||||
|
|
@ -242,23 +241,24 @@ EOF
|
|||
|
||||
chmod 600 %{buildroot}%{_sysconfdir}/bluetooth/pin
|
||||
|
||||
rm -f %{buildroot}/etc/default/bluetooth %{buildroot}/etc/init.d/bluetooth
|
||||
install -D -c -m 0644 %SOURCE6 %buildroot%_sysconfdir/sysconfig/pand
|
||||
install -D -c -m 0644 %SOURCE7 %buildroot%_sysconfdir/sysconfig/dund
|
||||
install -D -c -m 0644 %SOURCE8 %buildroot%_sysconfdir/sysconfig/hidd
|
||||
install -D -c -m 0644 %SOURCE9 %buildroot%_sysconfdir/sysconfig/rfcomm
|
||||
rm -f %{buildroot}%{_sysconfdir}/default/bluetooth %{buildroot}%{_sysconfdir}/init.d/bluetooth
|
||||
install -m644 %{SOURCE6} -D %{buildroot}%{_sysconfdir}/sysconfig/pand
|
||||
install -m644 %{SOURCE7} -D %{buildroot}%{_sysconfdir}/sysconfig/dund
|
||||
install -m644 %{SOURCE8} -D %{buildroot}%{_sysconfdir}/sysconfig/hidd
|
||||
install -m644 %{SOURCE9} -D %{buildroot}%{_sysconfdir}/sysconfig/rfcomm
|
||||
|
||||
rm -rf %{buildroot}/%{_lib}/pkgconfig
|
||||
install -m644 bluez.pc -D %{buildroot}%{_libdir}/pkgconfig/bluez.pc
|
||||
|
||||
# Remove the cups backend from libdir, and install it in /usr/lib whatever the install
|
||||
if test -d %{buildroot}/%{_lib}/cups ; then
|
||||
install -D -m0755 %{buildroot}/%{_lib}/cups/backend/bluetooth %{buildroot}/usr/lib/cups/backend/bluetooth
|
||||
install -D -m0755 %{buildroot}/%{_lib}/cups/backend/bluetooth %{buildroot}%{_prefix}/lib/cups/backend/bluetooth
|
||||
rm -rf %{buildroot}/%{_lib}/cups
|
||||
fi
|
||||
|
||||
cp test/test-* %{buildroot}%{_bindir}
|
||||
cp test/simple-agent %{buildroot}%{_bindir}/simple-agent
|
||||
rm -f %{buildroot}%{_bindir}/test-*.c
|
||||
|
||||
mkdir -p %{buildroot}/{bin,sbin}
|
||||
mv %{buildroot}%{_bindir}/hidd %{buildroot}/bin
|
||||
|
|
@ -278,17 +278,26 @@ install -m0644 serial/serial.conf %{buildroot}%{_sysconfdir}/bluetooth/
|
|||
mkdir -p %{buildroot}%{_libdir}/alsa-lib/
|
||||
mv %{buildroot}/%{_lib}/alsa-lib/*.so %{buildroot}%{_libdir}/alsa-lib/
|
||||
|
||||
# remove unpackaged files
|
||||
rm -f %{buildroot}/%{_libdir}/*/*.la
|
||||
rm -f %{buildroot}/%{_lib}/*/*.la
|
||||
|
||||
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
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Jul 08 2012 Bernhard Rosenkraenzer <bero@bero.eu> 4.101-4
|
||||
+ Revision: 808508
|
||||
- Rebuild for libudev.so.1
|
||||
|
||||
* Fri Jun 29 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 4.101-3
|
||||
+ Revision: 807491
|
||||
- fix buildrequires
|
||||
- get rid of /usr/bin/test-textfile.c that got packaged
|
||||
- add url
|
||||
- package gatttool
|
||||
- move libtoolize & autoreconf to %%prep
|
||||
- cleanups
|
||||
- fix compatibility with ISO C++11 (P9)
|
||||
|
||||
* Tue Jun 26 2012 Alexander Khrukin <akhrukin@mandriva.org> 4.101-2
|
||||
+ Revision: 807024
|
||||
- rel up
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue