From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 11 Apr 2004 13:47:21 +0000 (+0000)
Subject: - updated to 2.6 (for bluez-libs 2.6), obsoletes bluez-sdp
X-Git-Tag: auto/ac/bluez-utils-2_6-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbluez-utils.git;a=commitdiff_plain;h=344f6dee40e0392b9b8ce17a78cfd476780f0b0d

- updated to 2.6 (for bluez-libs 2.6), obsoletes bluez-sdp
- updated opt,etc_dir patches, added sdp patch

Changed files:
    bluez-utils.spec -> 1.16
---

diff --git a/bluez-utils.spec b/bluez-utils.spec
index 1a9e152..9247d89 100644
--- a/bluez-utils.spec
+++ b/bluez-utils.spec
@@ -3,22 +3,27 @@
 Summary:	Bluetooth utilities
 Summary(pl):	Narzêdzia Bluetooth
 Name:		bluez-utils
-Version:	2.4
+Version:	2.6
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
-# Source0-md5:	bf5beebfaf0c9106764f191b02eba417
+# Source0-md5:	c8fa21bec5f226f3af8a36d281d77202
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-etc_dir.patch
+Patch2:		%{name}-sdp.patch
 URL:		http://bluez.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	bluez-libs-devel >= 2.0
+BuildRequires:	bison
+BuildRequires:	bluez-libs-devel >= 2.6
 BuildRequires:	libtool
+PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	bluez-libs >= 2.6
+Obsoletes:	bluez-sdp
 ExcludeArch:	s390 s390x
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,6 +53,7 @@ Narz
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # fix path (default prefix was /)
 sed -e "s@pin_helper.*bluepin;@pin_helper %{_bindir}/bluepin;@" \
@@ -68,9 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	confdir=%{_sysconfdir}/bluetooth \
-	mandir=%{_mandir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth