X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bluez.spec;h=e4f9a371dd9cf6b2f9c780c03f8a3af231d75171;hb=2686afe62b344e40fce2012432ab3de3c8076ffb;hp=bcf52fd1ea6be1b4cbfc3a6c78bbe13b26594191;hpb=963aaacf823f03c46c93d6ae95ce0a24b57e6bc4;p=packages%2Fbluez.git

diff --git a/bluez.spec b/bluez.spec
index bcf52fd..e4f9a37 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,44 +1,46 @@
 # TODO:
 # - verify/update bluetooth init script
-# - update (or drop if it's no longer applicable) rfcomm init script
-# - separate obexd here? / separate -client in obexd.spec
+# - separate obex?
+#
+# Conditional build:
+%bcond_without	deprecated	# deprecated tools (ciptool,hciattach,hciconfig,hcidump,hcitool,rfcomm,sdptool)
+#
 Summary:	Bluetooth utilities
 Summary(pl.UTF-8):	Narzędzia Bluetooth
 Name:		bluez
-Version:	5.9
+Version:	5.50
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
-# Source0-md5:	d002e7266ea180c9609e55360219a5bd
+# Source0-md5:	8e35c67c81a55d3ad4c9f22280dae178
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-# FIXME: rfcomm.conf no longer supported
-Source5:	rfcomm.init
-Patch0:		%{name}-wacom-mode-2.patch
 URL:		http://www.bluez.org/
+BuildRequires:	alsa-lib-devel >= 1.0
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	check-devel >= 0.9.6
-BuildRequires:	dbus-devel >= 1.4
+BuildRequires:	dbus-devel >= 1.6
+BuildRequires:	ell-devel >= 0.3
 BuildRequires:	glib2-devel >= 1:2.28
+BuildRequires:	json-c-devel
 BuildRequires:	libical-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.626
-BuildRequires:	systemd-units >= 38
+BuildRequires:	rpmbuild(macros) >= 1.682
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	udev-devel >= 1:143
+BuildRequires:	udev-devel >= 1:172
 BuildRequires:	xz
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	dbus-libs >= 1.4
+Requires:	dbus-libs >= 1.6
 Requires:	glib2 >= 1:2.28
 Requires:	hwdata >= 0.225
 Requires:	rc-scripts
 Requires:	systemd-units >= 38
-Requires:	udev >= 1:143
+Requires:	udev >= 1:172
 Provides:	bluez-hcidump = %{version}
 Provides:	bluez-utils = %{version}-%{release}
 Provides:	obexd = %{version}
@@ -151,7 +153,6 @@ aplikacji Bluetooth.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -161,11 +162,19 @@ aplikacji Bluetooth.
 %{__automake}
 %configure \
 	--disable-silent-rules \
+	%{?with_deprecated:--enable-deprecated} \
+	--enable-btpclient \
+	--enable-experimental \
+	--enable-health \
 	--enable-library \
-	--enable-static
-# these options are broken; BR systemd instead
-#	--with-systemdsystemunitdir=%{systemdunitdir} \
-#	--with-systemduserunitdir=%{_prefix}/lib/systemd/user \
+	--enable-mesh \
+	--enable-midi \
+	--enable-nfc \
+	--enable-sap \
+	--enable-sixaxis \
+	--enable-static \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
+	--with-systemduserunitdir=%{systemduserunitdir}
 
 %{__make} \
 	cupsdir=%{cupsdir} \
@@ -175,7 +184,7 @@ aplikacji Bluetooth.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
-	$RPM_BUILD_ROOT{%{_libdir}/bluetooth/plugins,%{_sysconfdir}/bluetooth}
+	$RPM_BUILD_ROOT{%{_libdir}/{bluetooth,obex}/plugins,%{_sysconfdir}/bluetooth}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -183,13 +192,13 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
 	rulesdir=%{udevdir}/rules.d \
 	udevdir=%{udevdir}
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.{la,a}
+
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/rfcomm
 
 install profiles/input/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
 install profiles/network/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
-install profiles/proximity/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libbluetooth.la
 
@@ -198,17 +207,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add bluetooth
-/sbin/chkconfig --add rfcomm
 %service bluetooth restart
-%service rfcomm restart
 %systemd_post bluetooth.service
 
 %preun
 if [ "$1" = "0" ]; then
 	%service bluetooth stop
-	%service rfcomm stop
 	/sbin/chkconfig --del bluetooth
-	/sbin/chkconfig --del rfcomm
 fi
 %systemd_preun bluetooth.service
 
@@ -218,6 +223,10 @@ fi
 %triggerpostun -- bluez < 4.98-3
 %systemd_trigger bluetooth.service
 
+%triggerpostun -- bluez < 5.13-1
+%service rfcomm stop
+/sbin/chkconfig --del rfcomm
+
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -225,47 +234,61 @@ fi
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/bccmd
+%attr(755,root,root) %{_bindir}/bluemoon
 %attr(755,root,root) %{_bindir}/bluetoothctl
+%attr(755,root,root) %{_bindir}/btattach
 %attr(755,root,root) %{_bindir}/btmon
+%attr(755,root,root) %{_bindir}/hex2hcd
+%attr(755,root,root) %{_bindir}/l2ping
+%attr(755,root,root) %{_bindir}/l2test
+%attr(755,root,root) %{_bindir}/meshctl
+%attr(755,root,root) %{_bindir}/mpris-proxy
+%attr(755,root,root) %{_bindir}/rctest
+%if %{with deprecated}
 %attr(755,root,root) %{_bindir}/ciptool
 %attr(755,root,root) %{_bindir}/hciattach
 %attr(755,root,root) %{_bindir}/hciconfig
 %attr(755,root,root) %{_bindir}/hcidump
 %attr(755,root,root) %{_bindir}/hcitool
-%attr(755,root,root) %{_bindir}/l2ping
-%attr(755,root,root) %{_bindir}/l2test
-%attr(755,root,root) %{_bindir}/rctest
 %attr(755,root,root) %{_bindir}/rfcomm
 %attr(755,root,root) %{_bindir}/sdptool
+%endif
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/bluetooth
+%endif
+%attr(755,root,root) %{_libexecdir}/bluetooth/bluetoothd
+%attr(755,root,root) %{_libexecdir}/bluetooth/obexd
 %dir %{_libdir}/bluetooth
-%attr(755,root,root) %{_libdir}/bluetooth/bluetoothd
-%attr(755,root,root) %{_libdir}/bluetooth/obexd
 %dir %{_libdir}/bluetooth/plugins
+%attr(755,root,root) %{_libdir}/bluetooth/plugins/sixaxis.so
+%dir %{_libdir}/obex
+%dir %{_libdir}/obex/plugins
 %dir %{_sysconfdir}/bluetooth
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/input.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/network.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/proximity.conf
 %attr(754,root,root) /etc/rc.d/init.d/bluetooth
-%attr(754,root,root) /etc/rc.d/init.d/rfcomm
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/bluetooth.conf
 %{systemdunitdir}/bluetooth.service
-%{_prefix}/lib/systemd/user/obex.service
-%{_datadir}/dbus-1/system-services/org.bluez.service
+%{systemduserunitdir}/obex.service
 %{_datadir}/dbus-1/services/org.bluez.obex.service
+%{_datadir}/dbus-1/system-services/org.bluez.service
 %attr(755,root,root) %{udevdir}/hid2hci
 %{udevdir}/rules.d/97-hid2hci.rules
 %{_mandir}/man1/bccmd.1*
+%{_mandir}/man1/btattach.1*
+%{_mandir}/man1/hid2hci.1*
+%{_mandir}/man1/l2ping.1*
+%{_mandir}/man1/rctest.1*
+%if %{with deprecated}
 %{_mandir}/man1/ciptool.1*
 %{_mandir}/man1/hciattach.1*
 %{_mandir}/man1/hciconfig.1*
 %{_mandir}/man1/hcidump.1*
 %{_mandir}/man1/hcitool.1*
-%{_mandir}/man1/hid2hci.1*
-%{_mandir}/man1/l2ping.1*
-%{_mandir}/man1/rctest.1*
 %{_mandir}/man1/rfcomm.1*
 %{_mandir}/man1/sdptool.1*
+%endif
 %{_mandir}/man8/bluetoothd.8*
 
 %files -n cups-backend-bluetooth