rpms/usb_modeswitch/F-12 usb_modeswitch-dir.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 usb_modeswitch.spec, 1.6, 1.7

[Huzaifa Sidhpurwala]

Author: huzaifas

Update of /cvs/pkgs/rpms/usb_modeswitch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22171

Modified Files:
	.cvsignore sources usb_modeswitch.spec 
Added Files:
	usb_modeswitch-dir.patch 
Log Message:
version bump

usb_modeswitch-dir.patch:
 usb_modeswitch.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE usb_modeswitch-dir.patch ---
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 "/"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Sep 2009 09:04:34 -0000	1.5
+++ .cvsignore	8 Mar 2010 05:57:37 -0000	1.6
@@ -1 +1 @@
-usb_modeswitch-1.0.5.tar.bz2
+usb-modeswitch-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Sep 2009 09:04:34 -0000	1.5
+++ sources	8 Mar 2010 05:57:37 -0000	1.6
@@ -1 +1 @@
-294848bbbcbd77dc9a4caf08327ca297  usb_modeswitch-1.0.5.tar.bz2
+ca19c6d2b8f933133b5ea344474abc7d  usb-modeswitch-1.1.0.tar.bz2


Index: usb_modeswitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-12/usb_modeswitch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- usb_modeswitch.spec	17 Sep 2009 09:04:35 -0000	1.6
+++ usb_modeswitch.spec	8 Mar 2010 05:57:38 -0000	1.7
@@ -1,12 +1,15 @@
+%define source_name	usb-modeswitch
+
 Name:		usb_modeswitch
-Version:	1.0.5
-Release:	1%{?dist}
+Version:	1.1.0
+Release:	6%{?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
+Patch0:		usb_modeswitch-dir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libusb-devel
 
@@ -23,29 +26,77 @@ Dadurch erkennt Linux die Datenkarte und
 Verbindungen aufbauen. Die gängigen Karten von Huawei, T-Mobile,
 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
+Contains the device database and the rules file, including full paths
+
 %prep
-%setup -q
+%setup -q -n %{source_name}-%{version}
+%patch0 -p1 -b .dir
 
 %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%{_sysconfdir}/usb_modeswitch.d/
+mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}
+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/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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post data
+udevadm control --reload-rules
+
+%postun data
+udevadm control --reload-rules
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/usb_modeswitch
+%{_mandir}/man1/usb_modeswitch.1.gz
 %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf
-%doc COPYING README*
+%doc COPYING README ChangeLog
+
+%files data
+/lib/udev/rules.d/40-usb_modeswitch.rules
+/lib/udev/usb_modeswitch
+%{_sysconfdir}/usb_modeswitch.d/
 
 %changelog
+* 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