rpms/udev-extras/F-10 udev-extras.spec,1.3,1.4

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/udev-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21188

Modified Files:
	udev-extras.spec 
Log Message:
Ensure modem prober rules are removed


Index: udev-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev-extras/F-10/udev-extras.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- udev-extras.spec	20 Feb 2009 12:43:05 -0000	1.3
+++ udev-extras.spec	20 Feb 2009 12:56:59 -0000	1.4
@@ -1,4 +1,5 @@
-%define udev_scriptdir /lib/udev
+%define udev_bindir /lib/udev
+%define udev_scriptdir %{udev_bindir}
 
 Summary: Extra rules and tools for udev
 Name: udev-extras
@@ -35,8 +36,9 @@
 
 # Don't install modem prober for now; that's handled by NM at this time and
 # in the future will be handled by ModemManager instead
-rm -f $RPM_BUILD_ROOT%{udev_scriptdir}/modem-probe
+rm -f $RPM_BUILD_ROOT%{udev_bindir}/modem-probe
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/modem-probe*.8*
+rm -f $RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/77-probe-modem-capabilities.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,8 +47,8 @@
 %defattr(0644, root, root, 0755)
 %doc COPYING TODO 
 #%doc README ChangeLog
-%attr(0755,root,root) %{udev_scriptdir}/modem-modeswitch
-%attr(0755,root,root) %{udev_scriptdir}/usbdev_id
+%attr(0755,root,root) %{udev_bindir}/modem-modeswitch
+%attr(0755,root,root) %{udev_bindir}/usbdev_id
 %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
 %attr(0644,root,root) %{_mandir}/man8/modem-modeswitch*.8*