SPECS: bluez-utils.spec - ver. 3.3 - bluez utils init script back ...

[wrobell]

Author: wrobell                      Date: Wed Aug 23 17:09:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ver. 3.3
- bluez utils init script back to main package (udev acts as hotplug...
  less or more)
- updated URL

---- Files affected:
SPECS:
   bluez-utils.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/bluez-utils.spec
diff -u SPECS/bluez-utils.spec:1.39 SPECS/bluez-utils.spec:1.40
--- SPECS/bluez-utils.spec:1.39	Tue Jun  6 14:11:55 2006
+++ SPECS/bluez-utils.spec	Wed Aug 23 19:09:33 2006
@@ -2,34 +2,33 @@
 Summary:	Bluetooth utilities
 Summary(pl):	Narzędzia Bluetooth
 Name:		bluez-utils
-Version:	2.25
-Release:	4
+Version:	3.3
+Release:	1
 Epoch:		0
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
-# Source0-md5:	ae3729ab5592be06ed01b973d4b3e9fe
+# Source0-md5:	5868bd9d939fe5df769df7f9f4ca2e7e
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-udev.rules
 Source4:	%{name}-udev.script
 Patch0:		%{name}-etc_dir.patch
-Patch1:		%{name}-invalid-timeval.patch
-Patch2:		%{name}-poll-timeout.patch
-URL:		http://bluez.sourceforge.net/
+URL:		http://www.bluez.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	bluez-libs-devel >= 2.25
+BuildRequires:	bluez-libs-devel >= 3.3
 BuildRequires:	dbus-devel >= 0.33
 BuildRequires:	libtool
 BuildRequires:	libusb-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 # alsa-lib-devel, openobex-devel - currently only checked for, not used
-Requires:	bluez-libs >= 2.21
+Requires:	bluez-libs >= 3.3
 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)
@@ -88,8 +87,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -97,9 +94,8 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-bcm203x \
 	--enable-cups \
-	--enable-pcmcia \
+	--enable-pcmciarules \
 	--with-cups=/usr
 %{__make} \
 	cupsdir=%{cupsdir}
@@ -111,13 +107,17 @@
 
 %{__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
 
+mv $RPM_BUILD_ROOT/etc/udev/bluetooth.rules \
+	$RPM_BUILD_ROOT/etc/udev/rules.d/71-bluetooth.rules
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -137,31 +137,34 @@
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man*/*
+
+%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/sysconfig/bluetooth
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
-%dir %{_sysconfdir}/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}/dbus-1/system.d/*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hotplug/usb/bcm203x.usermap
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcmcia/bluetooth
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcmcia/bluetooth.conf
 
 %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
-%attr(755,root,root) /lib/udev/bluetooth.sh
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/70-bluetooth.rules
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/08/23 17:09:33  wrobell
+- ver. 3.3
+- bluez utils init script back to main package (udev acts as hotplug...
+  less or more)
+- updated URL
+
 Revision 1.39  2006/06/06 12:11:55  qboosh
 - merged invalid-timeval,poll-timeout patches and files update from AC-branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bluez-utils.spec?r1=1.39&r2=1.40&f=u