- rel 3

[packages/bluez-utils.git] / bluez-utils.spec

diff --git a/bluez-utils.spec b/bluez-utils.spec
index 9b5c4eb0ec22846c695721561f7cb872d768054f..fc65b0955023909cd5897ed111ab281b47667719 100644 (file)
--- a/bluez-utils.spec
+++ b/bluez-utils.spec
@@ -1,30 +1,30 @@
-# TODO:
-# - check init script, add support for rfcomm bind on startup
-#
 Summary:       Bluetooth utilities
 Summary(pl):   Narzêdzia Bluetooth
 Name:          bluez-utils
-Version:       2.11
-Release:       2
+Version:       2.25
+Release:       3
 Epoch:         0
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
-# Source0-md5: 7412f38715e2de769950a63ae2d3fb47
+# 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
 BuildRequires: automake
 BuildRequires: bison
-BuildRequires: bluez-libs-devel >= 2.11
-BuildRequires: dbus-devel
+BuildRequires: bluez-libs-devel >= 2.25
+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
-PreReq:                rc-scripts
-Requires:      bluez-libs >= 2.11
+Requires:      bluez-libs >= 2.21
+Requires:      rc-scripts
 Obsoletes:     bluez-pan
 Obsoletes:     bluez-sdp
 Conflicts:     bluez-bluefw
@@ -60,7 +60,7 @@ Narz
 Summary:       Bluetooth backend for CUPS
 Summary(pl):   Backend Bluetooth dla CUPS-a
 Group:         Applications/Printing
-Requires:      bluez-libs >= 2.11
+Requires:      bluez-libs >= 2.21
 Requires:      cups
 
 %description -n cups-backend-bluetooth
@@ -73,8 +73,8 @@ Backend Bluetooth dla CUPS-a.
 Summary:       Init script for Bluetooth subsystem
 Summary(pl):   Skrypt init dla podsystemu Bluetooth
 Group:         Applications/System
-Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description init
 Init script for Bluetooth subsystem.
@@ -102,6 +102,7 @@ Skrypt init dla podsystemu Bluetooth.
 %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/70-bluetooth.rules,/lib/udev/bluetooth.sh}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -109,23 +110,19 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 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
 
-%postun init
+%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
 
@@ -135,13 +132,13 @@ fi
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man*/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/bluetooth
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
 %dir %{_sysconfdir}/bluetooth
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/bluetooth/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/*
 %attr(755,root,root) %{_sysconfdir}/hotplug/usb/bcm203x
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/hotplug/usb/bcm203x.usermap
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pcmcia/bluetooth.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pcmcia/bluetooth
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hotplug/usb/bcm203x.usermap
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcmcia/bluetooth.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcmcia/bluetooth
 
 %files -n cups-backend-bluetooth
 %defattr(644,root,root,755)
@@ -150,3 +147,5 @@ fi
 %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