--- tmp/bluez-utils.spec	2007-02-14 09:32:43 +0300
+++ RPM/SPECS/bluez-utils.spec	2007-04-19 10:38:04 +0400
@@ -13,11 +13,11 @@
 
 Source0: %name-%version.tar.gz
 Source1: bluetooth.init
-Source2: bluetooth.mod
 Patch0: bluez-utils-3.8-alt-hcid.conf.patch
 # patch from http://kmobiletools.org/node/228, updated for 3.9
 Patch1: bluez-utils-3.9-alt-pin-exec.patch
 Patch2: bluez-utils-3.9-alt-suse-dbus-retry.patch
+Patch3: bluez-utils-3.9-alt-udevdir.patch
 
 Provides: bluez-sdp bluez-sdp-devel bluez-pan
 Obsoletes: bluez-sdp bluez-sdp-devel bluez-pan
@@ -56,9 +56,11 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p1
 %__subst 's|/bin/fuser|/sbin/fuser|' scripts/bluetooth_serial
 
 %build
+%__autoreconf
 %configure \
 	--enable-avctrl \
 	--enable-bccmd \
@@ -74,12 +76,8 @@
 %make_build
 
 %install
-mkdir -p %buildroot{%_sysconfdir/{modutils.d,sysconfig},%_initdir}
-%makeinstall \
-	initdir=%buildroot%_initdir \
-	localstatedir=%buildroot/var \
-	confdir=%buildroot%_sysconfdir/bluetooth \
-	pcmciadir=%buildroot%_sysconfdir/pcmcia
+mkdir -p %buildroot{%_sysconfdir/sysconfig,%_initdir}
+%make DESTDIR=%buildroot install
 
 %__subst "s|^\(HIDD_ENABLE=\).*|\1false|" scripts/bluetooth.default
 %__subst "s|^\(RFCOMM_ENABLE=\).*|\1true|" scripts/bluetooth.default
@@ -87,7 +85,6 @@
 
 install -m 0755 %SOURCE1 %buildroot%_sbindir/bluetoothctl
 ln -s $(relative %_sbindir/bluetoothctl %_initdir/bluetooth)  %buildroot%_initdir/bluetooth
-install -m 0644 %SOURCE2 %buildroot%_sysconfdir/modutils.d/bluetooth
 
 cp daemon/passkey-agent %buildroot%_bindir/
 
@@ -105,8 +102,7 @@
 %config(noreplace) %_sysconfdir/bluetooth/hcid.conf
 %config(noreplace) %_sysconfdir/bluetooth/rfcomm.conf
 %config(noreplace) %_sysconfdir/sysconfig/bluetooth
-%config(noreplace) %_sysconfdir/modutils.d/bluetooth
-%config(noreplace) %_sysconfdir/udev/bluetooth.rules
+%config(noreplace) %_sysconfdir/udev/rules.d/bluetooth.rules
 %config(noreplace) %_sysconfdir/dbus-1/system.d/bluetooth.conf
 %_initdir/bluetooth
 %_sbindir/bluetoothctl
@@ -129,7 +125,7 @@
 %_sbindir/hcid
 %_sbindir/hid2hci
 %_sbindir/sdpd
-%_libexecdir/udev/bluetooth_serial
+/lib/udev/bluetooth_serial
 %_localstatedir/bluetooth/
 %_man1dir/ciptool.1.*
 %_man1dir/dfutool.1.*