packages: bluez/bluez.spec, bluez/bluez-oui.patch (REMOVED) - up to 4.75 - ...

[arvenil]

Author: arvenil                      Date: Tue Oct 12 21:08:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.75
- drop *-oui.patch, no more needed, use --with-ouifile instead

---- Files affected:
packages/bluez:
   bluez.spec (1.51 -> 1.52) , bluez-oui.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/bluez/bluez.spec
diff -u packages/bluez/bluez.spec:1.51 packages/bluez/bluez.spec:1.52
--- packages/bluez/bluez.spec:1.51	Thu Sep  2 08:45:14 2010
+++ packages/bluez/bluez.spec	Tue Oct 12 23:08:15 2010
@@ -2,22 +2,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
@@ -177,7 +176,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -186,6 +184,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	--with-ouifile=%{_datadir}/hwdata/oui.txt \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-static \
@@ -236,6 +235,8 @@
 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
@@ -327,6 +328,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2010/10/12 21:08:15  arvenil
+- up to 4.75
+- drop *-oui.patch, no more needed, use --with-ouifile instead
+
 Revision 1.51  2010/09/02 06:45:14  qboosh
 - actually enable capng
 - disable silent-rules as usual, dropped verbose bcond
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/bluez.spec?r1=1.51&r2=1.52&f=u