X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbluez-utils.git;a=blobdiff_plain;f=bluez-utils.spec;h=518f6370983e0f137f8728d77f607d7bf0a4de2d;hp=40fc5cd7ad5587350cdbed64e2afd9df2bc5a18d;hb=df2fe191e490815d684c630c75f05e878bd985b3;hpb=4a46a2d739fd2f6ae05f7a4722d8a787375bd8c4

diff --git a/bluez-utils.spec b/bluez-utils.spec
index 40fc5cd..518f637 100644
--- a/bluez-utils.spec
+++ b/bluez-utils.spec
@@ -1,14 +1,14 @@
 Summary:	Bluetooth utilities
 Summary(pl.UTF-8):	Narzędzia Bluetooth
 Name:		bluez-utils
-Version:	3.18
-Release:	1
+Version:	3.30
+Release:	2
 Epoch:		0
 License:	GPL v2+
 Group:		Applications/System
 #Source0Download: http://www.bluez.org/download.html
 Source0:	http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
-# Source0-md5:	2b6b4d519b8f75ef3990122934e660ba
+# Source0-md5:	3d17bb712d243bb1b316f7e8a909fa82
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-udev.rules
@@ -19,19 +19,19 @@ BuildRequires:	alsa-lib-devel >= 1.0.10-1
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	bluez-libs-devel >= 3.18
+BuildRequires:	bluez-libs-devel >= 3.30
 BuildRequires:	dbus-glib-devel >= 0.60
 BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	gstreamer-devel >= 0.10
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10
 BuildRequires:	hal-devel >= 0.5.8
+#BuildRequires:	libopensync-devel < 0.30
 BuildRequires:	libtool
 BuildRequires:	libusb-devel
+BuildRequires:	openobex-devel >= 1.1
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires: libopensync-devel
-BuildRequires:	openobex-devel >= 1.1
-Requires:	bluez-libs >= 3.18
+Requires:	bluez-libs >= 3.30
 Requires:	rc-scripts
 Obsoletes:	bluez-pan
 Obsoletes:	bluez-sdp
@@ -42,6 +42,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # currently lib, not %{_lib} (see cups.spec)
 %define		cupsdir		/usr/lib/cups/backend
+%define		udevdir		/%{_lib}/udev
 
 %description
 Bluetooth utilities:
@@ -49,6 +50,7 @@ Bluetooth utilities:
  - hciattach
  - hciconfig
  - hcid
+ - hidd
  - l2ping
  - start scripts (PLD)
  - PCMCIA configuration files
@@ -61,6 +63,7 @@ Narzędzia Bluetooth:
  - hciattach
  - hciconfig
  - hcid
+ - hidd
  - l2ping
  - skrypty startowe (PLD)
  - pliki konfiguracji PCMCIA
@@ -85,7 +88,7 @@ Wtyczki systemu ALSA dla urządzeń dźwiękowych Bluetooth.
 Summary:	Bluetooth backend for CUPS
 Summary(pl.UTF-8):	Backend Bluetooth dla CUPS-a
 Group:		Applications/Printing
-Requires:	bluez-libs >= 3.18
+Requires:	bluez-libs >= 3.30
 Requires:	cups
 
 %description -n cups-backend-bluetooth
@@ -98,7 +101,7 @@ Backend Bluetooth dla CUPS-a.
 Summary:	Bluetooth support for gstreamer
 Summary(pl.UTF-8):	Obsługa Bluetooth dla gstreamera
 Group:		Libraries
-Requires:	bluez-libs >= 3.18
+Requires:	bluez-libs >= 3.30
 Requires:	gstreamer >= 0.10
 Requires:	gstreamer-plugins-base >= 0.10
 
@@ -119,6 +122,7 @@ Obsługa Bluetooth dla gstreamera.
 %{__autoheader}
 %{__automake}
 %configure \
+	--enable-alsa \
 	--enable-audio \
 	--enable-avctrl \
 	--enable-bccmd \
@@ -126,47 +130,47 @@ Obsługa Bluetooth dla gstreamera.
 	--enable-dfutool \
 	--enable-glib \
 	--enable-gstreamer \
+	--enable-hal \
+	--enable-hid2hci \
 	--enable-input \
 	--enable-network \
+	--enable-obex \
 	--enable-pcmciarules \
+	--enable-sdpd \
+	--enable-hidd \
 	--enable-serial \
+	--disable-sync \
 	--enable-test \
-	--enable-hid2hci \
 	--enable-usb \
-	--enable-alsa \
-	--enable-hal \
-	--enable-pcmciarules \
-	--enable-obex \
-	--enable-sync \
 	--with-cups=/usr
 
 %{__make} \
-	cupsdir=%{cupsdir}
+	cupsdir=%{cupsdir} \
+	udevdir=%{udevdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-install -d $RPM_BUILD_ROOT{/etc/udev/rules.d,/lib/udev}
+install -d $RPM_BUILD_ROOT{/etc/udev/rules.d,%{udevdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	cupsdir=%{cupsdir} \
-	udevdir=/lib/udev
-# patch to makefile
-install transfer/bluetoothd-service-transfer $RPM_BUILD_ROOT%{_libdir}/bluetooth
-install transfer/transfer.service $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
-install sync/bluetoothd-service-sync $RPM_BUILD_ROOT%{_libdir}/bluetooth
-#
+	udevdir=%{udevdir}
+
+# noinst
+#install sync/bluetoothd-service-sync $RPM_BUILD_ROOT%{_libdir}/bluetooth
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/udev/rules.d/70-bluetooth.rules
-install %{SOURCE4} $RPM_BUILD_ROOT/lib/udev/bluetooth.sh
+install %{SOURCE4} $RPM_BUILD_ROOT%{udevdir}/bluetooth.sh
 install daemon/passkey-agent $RPM_BUILD_ROOT/%{_bindir}
 mv $RPM_BUILD_ROOT/etc/udev/bluetooth.rules \
 	$RPM_BUILD_ROOT/etc/udev/rules.d/71-bluetooth.rules
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer*/libgstbluetooth.la
 
 %clean
@@ -188,25 +192,16 @@ fi
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_libdir}/bluetooth
-%attr(755,root,root) %{_libdir}/bluetooth/bluetoothd-service-audio
-%attr(755,root,root) %{_libdir}/bluetooth/bluetoothd-service-network
-%attr(755,root,root) %{_libdir}/bluetooth/bluetoothd-service-serial
-%attr(755,root,root) %{_libdir}/bluetooth/bluetoothd-service-input
-%attr(755,root,root) %{_libdir}/bluetooth/bluetoothd-service-transfer
-%attr(755,root,root) %{_libdir}/bluetooth/bluetoothd-service-sync
+%dir %{_libdir}/bluetooth/plugins
+%attr(755,root,root) %{_libdir}/bluetooth/plugins/*.so
 %dir %{_sysconfdir}/bluetooth
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/hcid.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/rfcomm.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/input.service
-%{_sysconfdir}/bluetooth/audio.service
-%{_sysconfdir}/bluetooth/network.service
-%{_sysconfdir}/bluetooth/serial.service
-%{_sysconfdir}/bluetooth/transfer.service
 %attr(754,root,root) /etc/rc.d/init.d/bluetooth
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
-%attr(755,root,root) /lib/udev/bluetooth.sh
-%attr(755,root,root) /lib/udev/bluetooth_serial
+%attr(755,root,root) %{udevdir}/bluetooth.sh
+%attr(755,root,root) %{udevdir}/bluetooth_serial
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/70-bluetooth.rules
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/71-bluetooth.rules
 %{_mandir}/man[18]/*