move binary + package .setup

usb_modeswitch.spec

@@ -2,14 +2,13 @@
 
 Name:		usb_modeswitch
 Version:	1.1.2
-Release:	1%{?dist}
+Release:	2%{?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)
 Requires:	usb_modeswitch-data
 BuildRequires:	libusb-devel
@@ -30,7 +29,6 @@ Vodafone, Option, ZTE und Novatell werden unterstützt.
 
 %prep
 %setup -q -n %{source_name}-%{version}
-%patch0 -p1 -b .dir
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
@@ -45,6 +43,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 
 install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_bindir}/
 install -p -m 644 usb_modeswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}/
+install -p -m 644 usb_modeswitch.setup $RPM_BUILD_ROOT%{_sysconfdir}/
 gzip -9c usb_modeswitch.1 > usb_modeswitch.1.gz && install -m 644 usb_modeswitch.1.gz $RPM_BUILD_ROOT%{_datadir}/man/man1
 install -p -m 755 usb_modeswitch.tcl $RPM_BUILD_ROOT/lib/udev/usb_modeswitch
 
@@ -57,10 +56,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/usb_modeswitch.1.gz
 /lib/udev/usb_modeswitch
 %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf
+%config(noreplace) %{_sysconfdir}/usb_modeswitch.setup
 %doc COPYING README ChangeLog
 
 
 %changelog
+* Fri Apr 23 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.1.2-2
+- Move usb_modeswitch binary back to /usr/sbin
+- Package /etc/usb_modeswitch.setup for manual mode
+
 * Tue Apr 20 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.1.2-1
 - New upstream
 - Split data and main package