- fixed bluepin path in hcid.conf, started PLDified init script

Changed files:
    bluez-utils.spec -> 1.10

diff --git a/bluez-utils.spec b/bluez-utils.spec
index 0d379e97f5cc586947569f2f86b33c86fd86dc19..8ba9c803c134fadbd7b3070ef472e0ef23297d3f 100644 (file)
--- a/bluez-utils.spec
+++ b/bluez-utils.spec
@@ -1,4 +1,5 @@
-# TODO: PLDify init script
+# TODO: 
+# - check init script, add support for rfcomm bind on startup
 Summary:       Bluetooth utilities
 Summary(pl):   Narzêdzia Bluetooth
 Name:          bluez-utils
@@ -7,6 +8,8 @@ Release:        1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
+Source1:       %{name}.init
+Source2:       %{name}.sysconfig
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-etc_dir.patch
 URL:           http://bluez.sourceforge.net/
@@ -45,6 +48,11 @@ Narz
 %patch0 -p1
 %patch1 -p1
 
+# fix path (default prefix was /)
+sed -e "s@pin_helper.*bluepin;@pin_helper %{_bindir}/bluepin;@" \
+       hcid/hcid.conf > hcid.conf.tmp
+mv -f hcid.conf.tmp hcid/hcid.conf
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -56,14 +64,15 @@ Narz
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        confdir=%{_sysconfdir}/bluetooth \
        mandir=%{_mandir}
 
-%{__make} -C scripts \
-       DESTDIR=$RPM_BUILD_ROOT \
-       redhat
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,10 +96,11 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
-%attr(754,root,root) /etc/rc.d/init.d/bluetooth
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man*/*
+%attr(754,root,root) /etc/rc.d/init.d/bluetooth
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/bluetooth
 %dir %{_sysconfdir}/bluetooth
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/bluetooth/*
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pcmcia/bluetooth.conf