- updated to 2.15

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

diff --git a/bluez-utils.spec b/bluez-utils.spec
index c072c62bd8ed8332df53047884f21498e2b1d25f..4c54a6444c4b1b14c934484edcb62775e1d6a67f 100644 (file)
--- a/bluez-utils.spec
+++ b/bluez-utils.spec
@@ -1,29 +1,41 @@
 # TODO:
 # - check init script, add support for rfcomm bind on startup
+#
 Summary:       Bluetooth utilities
 Summary(pl):   Narzêdzia Bluetooth
 Name:          bluez-utils
-Version:       2.3
+Version:       2.15
 Release:       1
+Epoch:         0
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
-# Source0-md5: dcc22cb0b24debd5e65f9234d9ba7685
+# Source0-md5: 4e86dfd4449ff49e82696d8a3b254002
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
-Patch0:                %{name}-opt.patch
-Patch1:                %{name}-etc_dir.patch
+Patch0:                %{name}-etc_dir.patch
 URL:           http://bluez.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bluez-libs-devel >= 2.0
+BuildRequires: bison
+BuildRequires: bluez-libs-devel >= 2.15
+BuildRequires: dbus-devel
 BuildRequires: libtool
-Requires(post,preun):  /sbin/chkconfig
+BuildRequires: libusb-devel
+# alsa-lib-devel, openobex-devel - currently only checked for, not used
+PreReq:                rc-scripts
+Requires:      bluez-libs >= 2.15
+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 (bluez-utils):
+Bluetooth utilities:
  - hcitool
  - hciattach
  - hciconfig
@@ -35,7 +47,7 @@ Bluetooth utilities (bluez-utils):
 The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
 
 %description -l pl
-Narzêdzia Bluetooth (bluez-utils):
+Narzêdzia Bluetooth:
  - hcitool
  - hciattach
  - hciconfig
@@ -44,15 +56,35 @@ Narz
  - skrypty startowe (PLD)
  - pliki konfiguracji PCMCIA
 
+%package -n cups-backend-bluetooth
+Summary:       Bluetooth backend for CUPS
+Summary(pl):   Backend Bluetooth dla CUPS-a
+Group:         Applications/Printing
+Requires:      bluez-libs >= 2.11
+Requires:      cups
+
+%description -n cups-backend-bluetooth
+Bluetooth backend for CUPS.
+
+%description -n cups-backend-bluetooth -l pl
+Backend Bluetooth dla CUPS-a.
+
+%package init
+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
+
+%description init
+Init script for Bluetooth subsystem.
+
+%description init -l pl
+Skrypt init dla podsystemu Bluetooth.
+
 %prep
 %setup -q
 %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}
@@ -60,8 +92,12 @@ mv -f hcid.conf.tmp hcid/hcid.conf
 %{__autoconf}
 %{__automake}
 %configure \
-       --enable-pcmcia
-%{__make}
+       --enable-bcm203x \
+       --enable-cups \
+       --enable-pcmcia \
+       --with-cups=/usr
+%{__make} \
+       cupsdir=%{cupsdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,8 +105,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       confdir=%{_sysconfdir}/bluetooth \
-       mandir=%{_mandir}
+       cupsdir=%{cupsdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
@@ -78,7 +113,7 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post init
 /sbin/chkconfig --add bluetooth
 if [ -f /var/lock/subsys/bluetooth ]; then
        /etc/rc.d/init.d/bluetooth restart >&2
@@ -86,7 +121,7 @@ else
        echo "Run \"/etc/rc.d/init.d/bluetooth\" to start bluetooth." >&2
 fi
 
-%postun
+%postun init
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/bluetooth ]; then
                /etc/rc.d/init.d/bluetooth stop 1>&2
@@ -100,9 +135,18 @@ fi
 %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/*
+%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
+
+%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