rpms/bluez-utils/devel bluez-utils.spec,1.59,1.60

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13532

Modified Files:
	bluez-utils.spec 
Log Message:
fixes for 213984 and 241480


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- bluez-utils.spec	21 Jul 2007 09:40:08 -0000	1.59
+++ bluez-utils.spec	21 Jul 2007 10:49:35 -0000	1.60
@@ -14,6 +14,7 @@
 Source8: hidd.conf
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
+Patch1: bluez-utils-3.12-pand-man-page.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -54,6 +55,7 @@
 
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
@@ -74,7 +76,7 @@
 # Remove the cups backend from libdir, and install it in /usr/lib whatever the install
 rm -rf ${RPM_BUILD_ROOT}%{_libdir}/cups
 install -D -m0755 cups/bluetooth ${RPM_BUILD_ROOT}/usr/lib/cups/backend/bluetooth
-
+mv $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/bluetooth.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/97-bluetooth.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -105,7 +107,7 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING INSTALL ChangeLog NEWS README
+%doc AUTHORS COPYING INSTALL ChangeLog NEWS README */*.txt
 /etc/rc.d/init.d/*
 %{_bindir}/*
 %{_sbindir}/*
@@ -115,7 +117,7 @@
 %config(noreplace) %{_sysconfdir}/bluetooth/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 %config %{_sysconfdir}/dbus-1/system.d/*
-%config %{_sysconfdir}/udev/rules.d/bluetooth.rules
+%config %{_sysconfdir}/udev/rules.d/97-bluetooth.rules
 /lib/udev/bluetooth_serial
 %dir /var/lib/bluetooth
 
@@ -126,12 +128,14 @@
 %changelog
 * Sat Jul 21 2007 David Woodhouse <dwmw2 at infradead.org> 3.12-1
 - Update to bluez-utils 3.12
+- Fix reference dev-up script in pand.1 (#213984)
+- Include API docs (#241480)
 
-* Fri Jun 01 2007 - Bastien Nocera <bnocera at redhat.com> - 3.11-2
+* Fri Jun 01 2007 Bastien Nocera <bnocera at redhat.com> - 3.11-2
 - Add upstream patch to list discovered printer devices in the
   CUPS backend
 
-* Sat May 26 2007 - Bastien Nocera <bnocera at redhat.com> - 3.11-1
+* Sat May 26 2007 Bastien Nocera <bnocera at redhat.com> - 3.11-1
 - Update to bluez-utils 3.11
 - Move the cups backend to its expected location (#237482)
 - Remove merged input patch