rpms/usb_modeswitch/F-11 sources,1.4,1.5 usb_modeswitch.spec,1.4,1.5

[Bernie Innocenti]

Author: bernie

Update of /cvs/pkgs/rpms/usb_modeswitch/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5596

Modified Files:
	sources usb_modeswitch.spec 
Log Message:
Backport 1.1.2-3 from devel branch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Sep 2009 09:11:11 -0000	1.4
+++ sources	10 May 2010 03:24:44 -0000	1.5
@@ -1 +1 @@
-294848bbbcbd77dc9a4caf08327ca297  usb_modeswitch-1.0.5.tar.bz2
+071cb300d00938bfe20025c654303d92  usb-modeswitch-1.1.2.tar.bz2


Index: usb_modeswitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-11/usb_modeswitch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- usb_modeswitch.spec	17 Sep 2009 09:11:11 -0000	1.4
+++ usb_modeswitch.spec	10 May 2010 03:24:44 -0000	1.5
@@ -1,13 +1,16 @@
+%define source_name	usb-modeswitch
+
 Name:		usb_modeswitch
-Version:	1.0.5
-Release:	1%{?dist}
+Version:	1.1.2
+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}/%{name}-%{version}.tar.bz2
+Source0: 	http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	usb_modeswitch-data
 BuildRequires:	libusb-devel
 
 %description
@@ -23,29 +26,70 @@ Dadurch erkennt Linux die Datenkarte und
 Verbindungen aufbauen. Die gängigen Karten von Huawei, T-Mobile,
 Vodafone, Option, ZTE und Novatell werden unterstützt.
 
+
 %prep
-%setup -q
+%setup -q -n %{source_name}-%{version}
 
 %build
-gcc $RPM_OPT_FLAGS -l usb -o usb_modeswitch usb_modeswitch.c
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}
-install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_bindir}/
+mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+
+install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_sbindir}/
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/usb_modeswitch
+%{_sbindir}/usb_modeswitch
+%{_mandir}/man1/usb_modeswitch.1.gz
+/lib/udev/usb_modeswitch
 %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf
-%doc COPYING README*
+%config(noreplace) %{_sysconfdir}/usb_modeswitch.setup
+%doc COPYING README ChangeLog
+
 
 %changelog
+* Fri Apr 23 2010 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1.1.2-3
+- Fix typo in binary location
+
+* Fri Apr 23 2010 Huzaifa Sidhpurwala <huzaifas at 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 at redhat.com> - 1.1.2-1
+- New upstream
+- Split data and main package
+
+* Mon Mar 8 2010 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1.1.0-6
+- Version bump for F-12 build
+
+* Sat Mar 6 2010 Huzaifa Sidhpurwala <huzaifas at redaht.com> - 1.1.0-5
+- Fix regression in rhbz #571001
+- Version bump
+
+* Thu Mar 4 2010 Huzaifa Sidhpurwala <huzaifas at 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 at redhat.com> 1.1.0-2
+- Reload udev when new rules are installed
+
+* Wed Mar 2 2010 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1.1.0-1
+- New upstream 1.1.0 release
+- Split package into binary and data part
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.5-1
 - new upstream 1.0.5 release