From 365ce91850c52f65755beb46968041b74bebc6ed Mon Sep 17 00:00:00 2001 From: Wu zheng Date: Wed, 23 Oct 2013 11:04:53 +0800 Subject: [PATCH] Modify package files to match bluez-5.X Change-Id: I13138e26e509538454da3eb8ba08c02d6e707f63 --- packaging/bluetooth.sh | 0 packaging/bluez.manifest | 5 ++ packaging/bluez.spec | 165 +++++++++++------------------------------------ 3 files changed, 41 insertions(+), 129 deletions(-) mode change 100644 => 100755 packaging/bluetooth.sh create mode 100644 packaging/bluez.manifest diff --git a/packaging/bluetooth.sh b/packaging/bluetooth.sh old mode 100644 new mode 100755 diff --git a/packaging/bluez.manifest b/packaging/bluez.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/bluez.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/bluez.spec b/packaging/bluez.spec index d2d2574..ca6ceef 100644 --- a/packaging/bluez.spec +++ b/packaging/bluez.spec @@ -18,8 +18,9 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: udev BuildRequires: pkgconfig(libnl-1) +BuildRequires: libical-devel Url: http://www.bluez.org -Version: 4.101 +Version: 5.10 Release: 0 Summary: Bluetooth Stack for Linux License: GPL-2.0+ @@ -30,6 +31,7 @@ Source3: bluetooth.sysconfig Source4: bluetooth.sh Source5: baselibs.conf Source7: bluetooth.modprobe +Source1001: bluez.manifest %define cups_lib_dir %{_prefix}/lib/cups @@ -64,6 +66,12 @@ Requires: libbluetooth = %{version} Contains the files required by CUPS for printing to Bluetooth-connected printers. +%package -n obexd +Summary: OBEX Server A basic OBEX server implementation +Group: Applications/System + +%description -n obexd +OBEX Server A basic OBEX server implementation. %package test Summary: Tools for testing of various Bluetooth-functions @@ -77,80 +85,20 @@ Requires: python-gobject Contains a few tools for testing various bluetooth functions. The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A. - -%package sbc -Summary: Bluetooth Low-Complexity, Sub-Band Codec Utilities -License: GPL-2.0+ -Group: Connectivity/Bluetooth -Requires: libbluetooth = %{version} -Requires: libsbc = %{version} - -%description sbc -The package contains utilities for using the SBC codec. - -The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA. - - - -%package -n libsbc -Summary: Bluetooth Low-Complexity, Sub-Band Codec Library -License: GPL-2.0+ -Group: Connectivity/Bluetooth -Requires: libbluetooth = %{version} - -%description -n libsbc -The package contains libraries for using the SBC codec. - -The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA. - -%package alsa -Summary: Bluetooth Sound Support -License: GPL-2.0+ -Group: Connectivity/Bluetooth -Requires: libbluetooth = %{version} -Provides: bluez-audio:%_libdir/alsa-lib/libasound_module_pcm_bluetooth.so - -%description alsa -The package contains libraries for using bluetooth audio services. - -The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA. - - -%package compat -Summary: Bluetooth Stack for Linux -License: GPL-2.0+ -Group: Connectivity/Bluetooth -Requires: libbluetooth = %{version} - -%description compat -The Bluetooth stack for Linux. This package contains older and partly -deprecated binaries that might still be needed for compatibility. - - %prep %setup -q +cp %{SOURCE1001} . %build autoreconf -fiv + +export CFLAGS="${CFLAGS} -D__TIZEN_PATCH__" %configure --with-pic \ --libexecdir=/lib \ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-dfutool \ - --enable-cups \ - --enable-test \ - --enable-pand \ - --enable-dund \ - --enable-proximity \ - --enable-wiimote \ - --enable-thermometer \ - --enable-datafiles \ - --enable-pcmcia \ - --with-systemdunitdir=%{_unitdir} \ + --disable-usb \ + --enable-test \ + --enable-library \ + --with-systemdunitdir=%{_unitdir} \ %{?with_libcapng} make %{?_smp_mflags} all V=1 @@ -161,23 +109,6 @@ make check %make_install # bluez-test -cd test -install --mode=0755 \ - simple-agent \ - simple-service \ - list-devices \ - test-audio \ - test-adapter \ - test-device \ - test-discovery \ - test-input \ - test-manager \ - test-network \ - test-serial \ - test-service \ - test-telephony \ - $RPM_BUILD_ROOT/%{_bindir}/ -cd .. rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-* install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/usr/lib/udev/bluetooth.sh install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf @@ -191,18 +122,12 @@ fi install --mode 0755 -d $RPM_BUILD_ROOT/var/lib/bluetooth - - - -%post -n libsbc -p /sbin/ldconfig - -%postun -n libsbc -p /sbin/ldconfig - %post -n libbluetooth -p /sbin/ldconfig %postun -n libbluetooth -p /sbin/ldconfig %files +%manifest %{name}.manifest %defattr(-, root, root) %license COPYING %{_bindir}/hcitool @@ -211,20 +136,14 @@ install --mode 0755 -d $RPM_BUILD_ROOT/var/lib/bluetooth %{_bindir}/sdptool %{_bindir}/ciptool #%{_bindir}/dfutool -%{_bindir}/gatttool -%{_sbindir}/hciattach -%{_sbindir}/hciconfig -%{_sbindir}/bluetoothd +%{_bindir}/hciattach +%{_bindir}/hciconfig +/lib/bluetooth/bluetoothd +%{_bindir}/bccmd #%{_sbindir}/hid2hci -%{_sbindir}/bccmd %dir /usr/lib/udev /usr/lib/udev/* -/usr/lib/udev/bluetooth_serial -/usr/lib/udev/rules.d/97-bluetooth-serial.rules -/usr/share/dbus-1/system-services/org.bluez.service -%dir %{_sysconfdir}/bluetooth -%config(noreplace) %{_sysconfdir}/bluetooth/main.conf -%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf +%{_datadir}/dbus-1/system-services/org.bluez.service %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf %dir /var/lib/bluetooth %dir %{_sysconfdir}/modprobe.d @@ -232,52 +151,40 @@ install --mode 0755 -d $RPM_BUILD_ROOT/var/lib/bluetooth %{_unitdir}/bluetooth.service %files devel +%manifest %{name}.manifest %defattr(-, root, root) /usr/include/bluetooth %{_libdir}/libbluetooth.so %{_libdir}/pkgconfig/bluez.pc %files -n libbluetooth +%manifest %{name}.manifest %defattr(-, root, root) %{_libdir}/libbluetooth.so.* %license COPYING %files cups +%manifest %{name}.manifest %defattr(-,root,root) %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend %{cups_lib_dir}/backend/bluetooth +%files -n obexd +%defattr(-,root,root,-) +/lib/bluetooth/obexd +%{_libdir}/systemd/user/obex.service +%{_datadir}/dbus-1/services/org.bluez.obex.service + %files test +%manifest %{name}.manifest %defattr(-,root,root) -%{_sbindir}/hciemu +%{_libdir}/bluez/test/* %{_bindir}/l2test %{_bindir}/rctest -%{_bindir}/list-devices -%{_bindir}/simple-agent -%{_bindir}/simple-service -%{_bindir}/test-adapter -%{_bindir}/test-audio -%{_bindir}/test-device -%{_bindir}/test-discovery -%{_bindir}/test-input -%{_bindir}/test-manager -%{_bindir}/test-network -%{_bindir}/test-serial -%{_bindir}/test-service -%{_bindir}/test-telephony - -%files alsa -%defattr(-,root,root) -%dir /usr/share/alsa -%config /usr/share/alsa/bluetooth.conf -%{_libdir}/alsa-lib/*.so - - -%files compat -%defattr(-,root,root) -%{_bindir}/dund -%{_bindir}/pand +%{_bindir}/bluetoothctl +%{_bindir}/btmon +%{_bindir}/hcidump %docs_package -- 2.7.4