- updated status section from r1.12

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

diff --git a/bluez-utils.spec b/bluez-utils.spec
index cff5c7c9d76a936d93b83753817c9e2c7aea0b14..a904d5366dc89f3dd54f99bddfaa2593e1992fc2 100644 (file)
--- a/bluez-utils.spec
+++ b/bluez-utils.spec
@@ -1,32 +1,39 @@
-# TODO:
-# - check init script, add support for rfcomm bind on startup
-#
 Summary:       Bluetooth utilities
 Summary(pl):   Narzêdzia Bluetooth
 Name:          bluez-utils
-Version:       2.17
+Version:       3.7
 Release:       1
 Epoch:         0
 License:       GPL v2
 Group:         Applications/System
+#Source0Download: http://www.bluez.org/download.html
 Source0:       http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
-# Source0-md5: 42be19b0029a83824358baa0106da947
+# Source0-md5: 89f7290907d098163a2fa59a55dfafe7
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
+Source3:       %{name}-udev.rules
+Source4:       %{name}-udev.script
 Patch0:                %{name}-etc_dir.patch
-URL:           http://bluez.sourceforge.net/
+URL:           http://www.bluez.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
-BuildRequires: bluez-libs-devel >= 2.15
-BuildRequires: dbus-devel < 0.30
+BuildRequires: bluez-libs-devel >= 3.7
+BuildRequires: dbus-glib-devel >= 0.35
 BuildRequires: libtool
 BuildRequires: libusb-devel
-# alsa-lib-devel, openobex-devel - currently only checked for, not used
-PreReq:                rc-scripts
-Requires:      bluez-libs >= 2.15
+BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.268
+# for future use (ALSA plugins not finished)
+#BuildRequires:        alsa-lib-devel >= 0.9
+# for future use (fuse module is just testing stub now)
+#BuildRequires:        libfuse-devel
+#BuildRequires:        openobex-devel >= 1.1
+Requires:      bluez-libs >= 3.7
+Requires:      rc-scripts
 Obsoletes:     bluez-pan
 Obsoletes:     bluez-sdp
+Obsoletes:     bluez-utils-init
 Conflicts:     bluez-bluefw
 ExcludeArch:   s390 s390x
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,7 +67,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 >= 3.7
 Requires:      cups
 
 %description -n cups-backend-bluetooth
@@ -73,8 +80,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.
@@ -92,9 +99,11 @@ Skrypt init dla podsystemu Bluetooth.
 %{__autoconf}
 %{__automake}
 %configure \
-       --enable-bcm203x \
+       --enable-avctrl \
+       --enable-bccmd \
        --enable-cups \
-       --enable-pcmcia \
+       --enable-dfutool \
+       --enable-pcmciarules \
        --with-cups=/usr
 %{__make} \
        cupsdir=%{cupsdir}
@@ -102,30 +111,31 @@ 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,/lib/udev}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       cupsdir=%{cupsdir}
+       cupsdir=%{cupsdir} \
+       udevdir=/lib/udev
 
 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
+install hcid/passkey-agent $RPM_BUILD_ROOT/%{_bindir}
+mv $RPM_BUILD_ROOT/etc/udev/bluetooth.rules \
+       $RPM_BUILD_ROOT/etc/udev/rules.d/71-bluetooth.rules
 
 %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,18 +145,19 @@ 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
-%dir %{_sysconfdir}/bluetooth
-%config(noreplace) %verify(not size mtime md5) %{_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
+
+%attr(754,root,root) /etc/rc.d/init.d/bluetooth
+%attr(755,root,root) /lib/udev/bluetooth.sh
+%attr(755,root,root) /lib/udev/bluetooth_serial
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/70-bluetooth.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/71-bluetooth.rules
+
+%dir /etc/bluetooth
+%dir /etc/sysconfig/bluetooth
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/*
 
 %files -n cups-backend-bluetooth
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_prefix}/lib/cups/backend/bluetooth
-
-%files init
-%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/bluetooth