From: arvenil <arvenil@pld-linux.org>
Date: Tue, 12 Oct 2010 21:08:15 +0000 (+0000)
Subject: - up to 4.75
X-Git-Tag: auto/th/bluez-4_79-1~7
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=16869a45e0392e0a54163ec449d625a842a7247e;p=packages%2Fbluez.git

- up to 4.75
- drop *-oui.patch, no more needed, use --with-ouifile instead

Changed files:
    bluez-oui.patch -> 1.3
    bluez.spec -> 1.52
---

diff --git a/bluez-oui.patch b/bluez-oui.patch
deleted file mode 100644
index 9dfe5dc..0000000
--- a/bluez-oui.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- bluez-4.47/src/oui.c~	2009-01-08 17:00:12.000000000 +0100
-+++ bluez-4.47/src/oui.c	2009-08-08 13:51:09.519278151 +0200
-@@ -38,7 +38,7 @@
- 
- /* http://standards.ieee.org/regauth/oui/oui.txt */
- 
--#define OUIFILE "/var/lib/misc/oui.txt"
-+#define OUIFILE "/usr/share/hwdata/oui.txt"
- 
- char *ouitocomp(const char *oui)
- {
-@@ -48,12 +48,7 @@
- 
- 	fd = open("oui.txt", O_RDONLY);
- 	if (fd < 0) {
--		fd = open(OUIFILE, O_RDONLY);
--		if (fd < 0) {
--			fd = open("/usr/share/misc/oui.txt", O_RDONLY);
--			if (fd < 0)
--				return NULL;
--		}
-+		return NULL;
- 	}
- 
- 	if (fstat(fd, &st) < 0) {
diff --git a/bluez.spec b/bluez.spec
index 1aee1e2..a36c666 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,22 +1,21 @@
 Summary:	Bluetooth utilities
 Summary(pl.UTF-8):	Narzędzia Bluetooth
 Name:		bluez
-Version:	4.69
+Version:	4.75
 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:	986a08fb5c94ebd7d1a4d702e45ee34e
+# Source0-md5:	ee95086aef5955b25f1226b9e45bd6be
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	dund.init
 Source4:	pand.init
 Source5:	rfcomm.init
 Patch0:		%{name}-etc_dir.patch
-Patch1:		%{name}-oui.patch
-Patch2:		%{name}-wacom-mode-2.patch
-Patch3:		%{name}-try-utf8-harder.patch
+Patch1:		%{name}-wacom-mode-2.patch
+Patch2:		%{name}-try-utf8-harder.patch
 URL:		http://www.bluez.org/
 BuildRequires:	alsa-lib-devel >= 1.0.10-1
 BuildRequires:	autoconf >= 2.60
@@ -176,7 +175,6 @@ aplikacji Bluetooth.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -185,6 +183,7 @@ aplikacji Bluetooth.
 %{__autoheader}
 %{__automake}
 %configure \
+	--with-ouifile=%{_datadir}/hwdata/oui.txt \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-static \
@@ -235,6 +234,8 @@ install input/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
 install network/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
 install serial/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
 
+mv -fT $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/alsa
+
 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