SPECS: bluez-utils.spec - fix udev paths - rel 2

[jareq]

Author: jareq                        Date: Sun Nov  4 17:31:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix udev paths
- rel 2

---- Files affected:
SPECS:
   bluez-utils.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/bluez-utils.spec
diff -u SPECS/bluez-utils.spec:1.68 SPECS/bluez-utils.spec:1.69
--- SPECS/bluez-utils.spec:1.68	Sat Sep  8 11:55:09 2007
+++ SPECS/bluez-utils.spec	Sun Nov  4 18:31:14 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Narzędzia Bluetooth
 Name:		bluez-utils
 Version:	3.18
-Release:	1
+Release:	2
 Epoch:		0
 License:	GPL v2+
 Group:		Applications/System
@@ -43,6 +43,7 @@
 
 # currently lib, not %{_lib} (see cups.spec)
 %define		cupsdir		/usr/lib/cups/backend
+%define		udevdir		/%{_lib}/udev
 
 %description
 Bluetooth utilities:
@@ -141,17 +142,18 @@
 	--with-cups=/usr
 
 %{__make} \
-	cupsdir=%{cupsdir}
+	cupsdir=%{cupsdir} \
+	udevdir=%{udevdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-install -d $RPM_BUILD_ROOT{/etc/udev/rules.d,/lib/udev}
+install -d $RPM_BUILD_ROOT{/etc/udev/rules.d,%{udevdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	cupsdir=%{cupsdir} \
-	udevdir=/lib/udev
+	udevdir=%{udevdir}
 
 # noinst
 install transfer/bluetoothd-service-transfer $RPM_BUILD_ROOT%{_libdir}/bluetooth
@@ -161,7 +163,7 @@
 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
+install %{SOURCE4} $RPM_BUILD_ROOT%{udevdir}/bluetooth.sh
 install daemon/passkey-agent $RPM_BUILD_ROOT/%{_bindir}
 mv $RPM_BUILD_ROOT/etc/udev/bluetooth.rules \
 	$RPM_BUILD_ROOT/etc/udev/rules.d/71-bluetooth.rules
@@ -205,8 +207,8 @@
 %attr(754,root,root) /etc/rc.d/init.d/bluetooth
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
-%attr(755,root,root) /lib/udev/bluetooth.sh
-%attr(755,root,root) /lib/udev/bluetooth_serial
+%attr(755,root,root) %{udevdir}/bluetooth.sh
+%attr(755,root,root) %{udevdir}/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
 %{_mandir}/man[18]/*
@@ -231,6 +233,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2007/11/04 17:31:14  jareq
+- fix udev paths
+- rel 2
+
 Revision 1.68  2007/09/08 09:55:09  qboosh
 - disable sync for now as it does nothing and doesn't build with current opensync
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bluez-utils.spec?r1=1.68&r2=1.69&f=u