- chkconfig must be run in preun, rel 2; STBR

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

diff --git a/bluez-utils.spec b/bluez-utils.spec
index a35dd8d83a7aea1bbf79a5327ad9900cd97d138a..9fa29b8f198000e3bb050fa122a64c382eb31cac 100644 (file)
--- a/bluez-utils.spec
+++ b/bluez-utils.spec
@@ -1,32 +1,38 @@
 # TODO:
 # - check init script, add support for rfcomm bind on startup
-#
 Summary:       Bluetooth utilities
 Summary(pl):   Narzêdzia Bluetooth
 Name:          bluez-utils
-Version:       2.7
+Version:       2.25
 Release:       2
+Epoch:         0
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
-# Source0-md5: 5b67e008efa785175cdbc3c8dcdebab2
+# Source0-md5: ae3729ab5592be06ed01b973d4b3e9fe
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
-Patch0:                %{name}-opt.patch
-Patch1:                %{name}-etc_dir.patch
-Patch2:                %{name}-cups.patch
+Patch0:                %{name}-etc_dir.patch
 URL:           http://bluez.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
-BuildRequires: bluez-libs-devel >= 2.7
+BuildRequires: bluez-libs-devel >= 2.25
+BuildRequires: dbus-devel >= 0.33
 BuildRequires: libtool
-PreReq:                rc-scripts
-Requires:      bluez-libs >= 2.7
+BuildRequires: libusb-devel
+# alsa-lib-devel, openobex-devel - currently only checked for, not used
+Requires:      bluez-libs >= 2.21
+Requires:      rc-scripts
+Obsoletes:     bluez-pan
 Obsoletes:     bluez-sdp
+Conflicts:     bluez-bluefw
 ExcludeArch:   s390 s390x
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# currently lib, not %{_lib} (see cups.spec)
+%define                cupsdir         /usr/lib/cups/backend
+
 %description
 Bluetooth utilities:
  - hcitool
@@ -53,7 +59,7 @@ Narz
 Summary:       Bluetooth backend for CUPS
 Summary(pl):   Backend Bluetooth dla CUPS-a
 Group:         Applications/Printing
-Requires:      bluez-libs >= 2.7
+Requires:      bluez-libs >= 2.21
 Requires:      cups
 
 %description -n cups-backend-bluetooth
@@ -66,8 +72,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}
 Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description init
 Init script for Bluetooth subsystem.
@@ -78,13 +84,6 @@ Skrypt init dla podsystemu Bluetooth.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -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}
@@ -92,16 +91,20 @@ mv -f hcid.conf.tmp hcid/hcid.conf
 %{__autoconf}
 %{__automake}
 %configure \
+       --enable-bcm203x \
+       --enable-cups \
        --enable-pcmcia \
        --with-cups=/usr
-%{__make}
+%{__make} \
+       cupsdir=%{cupsdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       cupsdir=%{cupsdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
@@ -117,7 +120,7 @@ else
        echo "Run \"/etc/rc.d/init.d/bluetooth\" to start bluetooth." >&2
 fi
 
-%postun init
+%preun init
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/bluetooth ]; then
                /etc/rc.d/init.d/bluetooth stop 1>&2
@@ -131,11 +134,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 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}/bluetooth/*
+%attr(755,root,root) %{_sysconfdir}/hotplug/usb/bcm203x
+%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)