bluez.spec - podbicie do 4.53

[Daniel Dawid Majewski]

Pewnego dnia wpadła wieść od Daniel Dawid Majewski i powiedziała :
> Pewnego dnia wpadła wieść od Daniel Dawid Majewski i powiedziała :
>> Pewnego dnia wpadła wieść od Bartosz Świątek i powiedziała :
>>> To, to mi na poprawne nie wygląda. Pierwsze "fd=" zmień z oui.txt na
>>> OUIFILE które zdefiniowałeś i problem zjedzony, nie?
>> Niczego nie definiowałem ;)
>> Ale OK, dify po raz trzeci...
> Co nagle to po diable, teraz powinno być OK
Akuku, #define ponownie na sali... ;]
-- 
Pozdrawiam,
Daniel Dawid Majewski
jabber:light-i/jid.pl
-------------- next part --------------
--- tools/parser.y.oryg	2009-09-03 05:58:36.000000000 +0200
+++ tools/parser.y	2009-09-21 17:17:22.000000000 +0200
@@ -153,7 +153,11 @@
 	if (filename) {
 		snprintf(file, MAXPATHLEN,  "%s", filename);
 	} else {
-		snprintf(file, MAXPATHLEN, "%s/.bluetooth/rfcomm.conf", getenv("HOME"));
+		char *etc_dir = getenv("HOME_ETC");
+		if (etc_dir)
+			snprintf(file, MAXPATHLEN, "%s/.bluetooth/rfcomm.conf", etc_dir);
+		else
+			snprintf(file, MAXPATHLEN, "%s/.bluetooth/rfcomm.conf", getenv("HOME"));
 
 		if ((getuid() == 0) || (access(file, R_OK) < 0))
 			snprintf(file, MAXPATHLEN, "%s/rfcomm.conf", CONFIGDIR);
-------------- next part --------------
--- bluez-4.53/src/oui.c.oryg	2009-09-03 05:58:36.000000000 +0200
+++ bluez-4.53/src/oui.c	2009-09-21 18:25:05.000000000 +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)
 {
@@ -46,14 +46,9 @@
 	char *str, *map, *off, *end;
 	int fd;
 
-	fd = open("oui.txt", O_RDONLY);
+	fd = open(OUIFILE, 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) {
-------------- next part --------------
--- bluez.spec.oryg	2009-09-21 16:18:48.000000000 +0200
+++ bluez.spec	2009-09-21 18:07:45.000000000 +0200
@@ -2,20 +2,20 @@
 Summary:	Bluetooth utilities
 Summary(pl.UTF-8):	Narzędzia Bluetooth
 Name:		bluez
-Version:	4.47
-Release:	3
+Version:	4.53
+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:	b54a199004b578ec5652014a5e62aeaa
+# Source0-md5:	432509193ea508da5ce23fe056625d0f
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	dund.init
 Source4:	pand.init
 Source5:	rfcomm.init
-Patch0:		%{name}-etc_dir.patch
-Patch1:		%{name}-oui.patch
+Patch0:		%{name}-etcdirtools.patch
+Patch1:		%{name}-ouisrc.patch
 Patch2:		%{name}-wacom-mode-2.patch
 Patch3:		%{name}-try-utf8-harder.patch
 URL:		http://www.bluez.org/
@@ -172,7 +172,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -324,7 +324,7 @@
 - rel 2; init scripts into separate files
 
 Revision 1.30  2009/07/31 06:56:01  matkor
-Update to 4.45-1. wacom patches added. (all by Przemysław Firszt).
+Update to 4.45-1. wacom patches added. (all by Przemysław Firszt).
 
 Revision 1.29  2009/07/18 10:11:29  charles
 - removed BR openobex-devel (not needed)