dir changes

usb_modeswitch-dir.patch

@@ -0,0 +1,12 @@
+diff -Naur usb-modeswitch-1.1.0/usb_modeswitch.sh usb-modeswitch-1.1.0.dir/usb_modeswitch.sh
+--- usb-modeswitch-1.1.0/usb_modeswitch.sh	2010-03-04 10:24:21.000000000 +0530
++++ usb-modeswitch-1.1.0.dir/usb_modeswitch.sh	2010-03-04 10:25:00.000000000 +0530
+@@ -35,7 +35,7 @@
+ global scsi usb match wc logging device
+ 
+ set dbdir	/etc/usb_modeswitch.d
+-set bindir	/usr/sbin
++set bindir	/usr/bin
+ 
+ # argv contains the values provided from the udev rule
+ # separated by "/"

usb_modeswitch.spec

@@ -2,13 +2,14 @@
 
 Name:		usb_modeswitch
 Version:	1.1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	USB Modeswitch gets 4G cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.draisberghof.de/usb_modeswitch/
 Source0: 	http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2
+Patch0:		usb_modeswitch-dir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libusb-devel
 
@@ -28,6 +29,7 @@ Vodafone, Option, ZTE und Novatell werden unterstützt.
 %package data
 Summary:	USB Modeswitch device database
 Requires:	udev
+Requires:	tcl
 Requires:       %{name} = %{version}-%{release}
 
 %description data
@@ -35,6 +37,7 @@ Contains the device database and the rules file, including full paths
 
 %prep
 %setup -q -n %{source_name}-%{version}
+%patch0 -p1 -b .dir
 
 %build
 make %{?_smp_mflags}
@@ -50,7 +53,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_bindir}/
 install -p -m 644 usb_modeswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}/
 gzip -9c usb_modeswitch.1 > usb_modeswitch.1.gz && install usb_modeswitch.1.gz $RPM_BUILD_ROOT%{_datadir}/man/man1
-install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT/lib/udev
+install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT/lib/udev/usb_modeswitch
 install -p -m 644  usb_modeswitch.d/* $RPM_BUILD_ROOT%{_sysconfdir}/usb_modeswitch.d/
 install -p -m 644 40-usb_modeswitch.rules $RPM_BUILD_ROOT/lib/udev/rules.d
 
@@ -72,10 +75,14 @@ udevadm control --reload-rules
 
 %files data
 /lib/udev/rules.d/40-usb_modeswitch.rules
-/lib/udev/usb_modeswitch.sh
+/lib/udev/usb_modeswitch
 %{_sysconfdir}/usb_modeswitch.d/
 
 %changelog
+* Thu Mar 4 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.0-3
+- Patch usb_modeswtich to use the binary from /usr/bin/
+- usb_modeswitch-data needs tcl
+
 * Wed Mar 2 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.0-2
 - Reload udev when new rules are installed