- removed BR openobex-devel (not needed)

[packages/bluez.git] / bluez.spec

diff --git a/bluez.spec b/bluez.spec
index 9218f91f03594948377cd0a76b9bea9351416ee3..aa7192f7dc3ae307ed6ea390f62f39e038283dd8 100644 (file)
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,18 +1,19 @@
 Summary:       Bluetooth utilities
 Summary(pl.UTF-8):     Narzędzia Bluetooth
 Name:          bluez
-Version:       4.38
+Version:       4.42
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 #Source0Download: http://www.bluez.org/download.html
 Source0:       http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
-# Source0-md5: 80eae83a64c634390b7e88a1ea12048f
+# Source0-md5: d24dfd3ca42847123e29f58b29af6948
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-udev.rules
 Source4:       %{name}-udev.script
 Patch0:                %{name}-etc_dir.patch
+Patch1:                %{name}-udev-path.patch
 URL:           http://www.bluez.org/
 BuildRequires: alsa-lib-devel >= 1.0.10-1
 BuildRequires: autoconf >= 2.50
@@ -22,10 +23,10 @@ BuildRequires:      dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.0
 BuildRequires: gstreamer-devel >= 0.10
 BuildRequires: gstreamer-plugins-base-devel >= 0.10
+BuildRequires: libnl-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libtool
 BuildRequires: libusb-compat-devel
-BuildRequires: openobex-devel >= 1.1
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
@@ -166,6 +167,7 @@ aplikacji Bluetooth.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -211,15 +213,14 @@ install -d $RPM_BUILD_ROOT{/etc/udev/rules.d,%{udevdir}}
        udevdir=%{udevdir}
 
 # noinst
-#install sync/bluetoothd-service-sync $RPM_BUILD_ROOT%{_libdir}/bluetooth
+install audio/audio.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
+install input/input.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
+install network/network.conf $RPM_BUILD_ROOT%{_sysconfdir}/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%{udevdir}/bluetooth.sh
-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/*.{,l}a
 rm -f $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.{,l}a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer*/libgstbluetooth.{,l}a
@@ -249,7 +250,10 @@ fi
 %dir %{_libdir}/bluetooth/plugins
 %attr(755,root,root) %{_libdir}/bluetooth/plugins/*.so
 %dir %{_sysconfdir}/bluetooth
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/audio.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/input.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/main.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/network.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/rfcomm.conf
 %attr(754,root,root) /etc/rc.d/init.d/bluetooth
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
@@ -257,11 +261,14 @@ fi
 %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
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/bluetooth-hid2hci.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/bluetooth-serial.rules
 %{_mandir}/man[18]/*
 
 %files -n alsa-plugins-bluetooth
 %defattr(644,root,root,755)
+%dir %{_sysconfdir}/alsa
+%{_sysconfdir}/alsa/bluetooth.conf
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_bluetooth.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_bluetooth.so