rpms/bluez-utils/devel bluez-utils-3.7-newconn-name.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 bluez-utils-2.3-conf.patch, 1.5, 1.6 bluez-utils.spec, 1.49, 1.50 sources, 1.14, 1.15 bluez-utils-2.25-invalid-timeval.patch, 1.1, NONE bluez-utils-2.25-poll-timeout.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31765

Modified Files:
	.cvsignore bluez-utils-2.3-conf.patch bluez-utils.spec sources 
Added Files:
	bluez-utils-3.7-newconn-name.patch 
Removed Files:
	bluez-utils-2.25-invalid-timeval.patch 
	bluez-utils-2.25-poll-timeout.patch 
Log Message:
bluez-utils 3.7

bluez-utils-3.7-newconn-name.patch:
 main.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bluez-utils-3.7-newconn-name.patch ---
--- bluez-utils-3.7/pand/main.c.orig	2006-09-29 23:19:27.000000000 +0100
+++ bluez-utils-3.7/pand/main.c	2006-09-29 23:18:49.000000000 +0100
@@ -210,7 +210,7 @@ static int do_listen(void)
 			ba2str(&l2a.l2_bdaddr, str);
 
 			syslog(LOG_INFO, "New connection from %s %s",
-								str, netdev);
+								str, devname);
 
 			run_devup(devname, str, sk, nsk);
 		} else {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Feb 2006 22:15:14 -0000	1.14
+++ .cvsignore	30 Sep 2006 13:52:04 -0000	1.15
@@ -1 +1 @@
-bluez-utils-2.25.tar.gz
+bluez-utils-3.7.tar.gz

bluez-utils-2.3-conf.patch:
 hcid.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: bluez-utils-2.3-conf.patch
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils-2.3-conf.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bluez-utils-2.3-conf.patch	2 Mar 2005 12:24:44 -0000	1.5
+++ bluez-utils-2.3-conf.patch	30 Sep 2006 13:52:04 -0000	1.6
@@ -1,27 +1,5 @@
 --- bluez-utils-2.15/hcid/hcid.conf.orig	2004-12-25 18:06:00.000000000 +0000
 +++ bluez-utils-2.15/hcid/hcid.conf	2005-03-02 11:49:53.000000000 +0000
-@@ -14,7 +14,7 @@
- 	#   auto - Use local PIN for incoming connections
- 	#   user - Always ask user for a PIN
- 	#
--	security auto;
-+	security user;
- 
- 	# Pairing mode
- 	#   none  - Pairing disabled
-@@ -23,10 +23,10 @@
- 	pairing multi;
- 
- 	# PIN helper
--	pin_helper /usr/bin/bluepin;
-+	#pin_helper /usr/bin/bluepin;
- 
- 	# D-Bus PIN helper
--	#dbus_pin_helper;
-+	dbus_pin_helper;
- }
- 
- # Default settings for HCI devices
 @@ -34,10 +34,10 @@
  	# Local device name
  	#   %d - device id


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- bluez-utils.spec	19 Jul 2006 19:08:22 -0000	1.49
+++ bluez-utils.spec	30 Sep 2006 13:52:04 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 2.25
-Release: 12 
+Version: 3.7
+Release: 1
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -14,8 +14,8 @@
 Source8: hidd.conf
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
-Patch1: bluez-utils-2.25-poll-timeout.patch
-Patch2: bluez-utils-2.25-invalid-timeval.patch
+Patch1: bluez-utils-3.7-newconn-name.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
 BuildRequires: bluez-libs-devel >= %{version}
@@ -56,16 +56,16 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
-	   --enable-all --disable-bcm203x --disable-alsa
+	   --enable-all --disable-bcm203x --enable-alsa --enable-bccmd \
+	   --enable-bccmd --enable-avctrl
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT rulesdir=%{_sysconfdir}/udev/rules.d
 rm -f $RPM_BUILD_ROOT/etc/default/bluetooth $RPM_BUILD_ROOT/etc/init.d/bluetooth
 for a in bluetooth dund hidd pand ; do 
 	install -D -m0755 $RPM_SOURCE_DIR/$a.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/$a
@@ -111,9 +111,9 @@
 %dir %{_sysconfdir}/bluetooth/
 %config(noreplace) %{_sysconfdir}/bluetooth/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
-%config %{_sysconfdir}/pcmcia/bluetooth.conf
-%config %attr(0755,root,root) %{_sysconfdir}/pcmcia/bluetooth
 %config %{_sysconfdir}/dbus-1/system.d/*
+%config %{_sysconfdir}/udev/rules.d/bluetooth.rules
+%{_libexecdir}/udev/bluetooth_serial
 %dir /var/lib/bluetooth
 
 %files cups
@@ -121,6 +121,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Sat Sep 30 2006 David Woodhouse <dwmw2 infradead org> 3.7-1
+- Update to bluez-utils 3.7
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp redhat com> - 2.25-12
 - Rebuild for dbus
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Feb 2006 22:15:14 -0000	1.14
+++ sources	30 Sep 2006 13:52:04 -0000	1.15
@@ -1 +1 @@
-ae3729ab5592be06ed01b973d4b3e9fe  bluez-utils-2.25.tar.gz
+89f7290907d098163a2fa59a55dfafe7  bluez-utils-3.7.tar.gz


--- bluez-utils-2.25-invalid-timeval.patch DELETED ---


--- bluez-utils-2.25-poll-timeout.patch DELETED ---