X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bluez-utils.spec;h=04bb530d63a2690c2577a4e94f9db5037c2b6ac5;hb=1dda66985289f600a88048eeafca16afcdd06dde;hp=ea4178684a8cfad9627d90a281f7ad80f7bb402c;hpb=cdb7e8fbc04d8454c0f70f3e1a93e4118e2e2e1c;p=packages%2Fbluez-utils.git

diff --git a/bluez-utils.spec b/bluez-utils.spec
index ea41786..04bb530 100644
--- a/bluez-utils.spec
+++ b/bluez-utils.spec
@@ -1,29 +1,40 @@
-# TODO: 
+# 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.25
 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:	ae3729ab5592be06ed01b973d4b3e9fe
 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.25
+BuildRequires:	dbus-devel >= 0.33
 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.21
+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 +46,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
@@ -43,16 +54,36 @@ Narz
  - l2ping
  - 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.21
+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 +91,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 +104,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 +112,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 +120,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 +134,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
+%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)
+%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