SPECS (AC-branch): bluez-utils.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Wed May 17 15:39:07 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   bluez-utils.spec (1.35 -> 1.35.2.1) 

---- Diffs:

================================================================
Index: SPECS/bluez-utils.spec
diff -u SPECS/bluez-utils.spec:1.35 SPECS/bluez-utils.spec:1.35.2.1
--- SPECS/bluez-utils.spec:1.35	Fri Feb  3 16:46:15 2006
+++ SPECS/bluez-utils.spec	Wed May 17 17:39:02 2006
@@ -1,11 +1,9 @@
 # $Revision$, $Date$
-# TODO:
-# - check init script, add support for rfcomm bind on startup
 Summary:	Bluetooth utilities
 Summary(pl):	Narzędzia Bluetooth
 Name:		bluez-utils
 Version:	2.25
-Release:	2
+Release:	3
 Epoch:		0
 License:	GPL v2
 Group:		Applications/System
@@ -13,6 +11,8 @@
 # Source0-md5:	ae3729ab5592be06ed01b973d4b3e9fe
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Source3:	%{name}-udev.rules
+Source4:	%{name}-udev.script
 Patch0:		%{name}-etc_dir.patch
 URL:		http://bluez.sourceforge.net/
 BuildRequires:	autoconf
@@ -22,6 +22,7 @@
 BuildRequires:	dbus-devel >= 0.33
 BuildRequires:	libtool
 BuildRequires:	libusb-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 # alsa-lib-devel, openobex-devel - currently only checked for, not used
 Requires:	bluez-libs >= 2.21
 Requires:	rc-scripts
@@ -102,6 +103,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+install -d $RPM_BUILD_ROOT{/etc/udev/rules.d,/lib/udev}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -109,23 +111,19 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/udev/rules.d/70-bluetooth.rules
+install %{SOURCE4} $RPM_BUILD_ROOT/lib/udev/bluetooth.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post init
 /sbin/chkconfig --add bluetooth
-if [ -f /var/lock/subsys/bluetooth ]; then
-	/etc/rc.d/init.d/bluetooth restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/bluetooth\" to start bluetooth." >&2
-fi
+%service bluetooth restart
 
 %preun init
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/bluetooth ]; then
-		/etc/rc.d/init.d/bluetooth stop 1>&2
-	fi
+	%service bluetooth stop
 	/sbin/chkconfig --del bluetooth
 fi
 
@@ -150,6 +148,8 @@
 %files init
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/bluetooth
+%attr(755,root,root) /lib/udev/bluetooth.sh
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/70-bluetooth.rules
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -157,6 +157,18 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35.2.1  2006/05/17 15:39:02  baggins
+- merged from HEAD
+
+Revision 1.38  2006/04/28 18:50:36  arekm
+- ups
+
+Revision 1.37  2006/04/28 18:47:00  arekm
+- rel 3
+
+Revision 1.36  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.35  2006/02/03 15:46:15  glen
 - chkconfig must be run in preun, rel 2; STBR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bluez-utils.spec?r1=1.35&r2=1.35.2.1&f=u