Merge from F21/rawhide, resurrect manpage patch

- remove obsolete patch usb_modeswitch-dir.patch.
- add a manual page for usb_modeswitch_dispatcher (rh #884203).
- fix several inconsistencies in the manual page and the
  help output of usb_modeswitch (rh #948451).

Resolves: #948451
Resolves: #884203

.gitignore

@@ -1,13 +1 @@
-usb-modeswitch-1.1.3.tar.bz2
-usb-modeswitch-1.1.4.tar.bz2
-/usb-modeswitch-1.1.6.tar.bz2
-/usb-modeswitch-1.1.7.tar.bz2
-/usb-modeswitch-1.1.9.tar.bz2
-/device_reference.txt
-/usb-modeswitch-1.2.0.tar.bz2
-/usb-modeswitch-1.2.1.tar.bz2
-/usb-modeswitch-1.2.2.tar.bz2
-/usb-modeswitch-1.2.4.tar.bz2
-/usb-modeswitch-1.2.5.tar.bz2
-/usb-modeswitch-1.2.6.tar.bz2
-/usb-modeswitch-1.2.7.tar.bz2
+/usb-modeswitch-*.tar.bz2

rhbz948451-fix-manual-pages.patch

@@ -0,0 +1,48 @@
+diff -up usb-modeswitch-1.2.7/usb_modeswitch.c.fix-manual-pages usb-modeswitch-1.2.7/usb_modeswitch.c
+--- usb-modeswitch-1.2.7/usb_modeswitch.c.fix-manual-pages	2013-08-20 12:12:10.752953754 +0200
++++ usb-modeswitch-1.2.7/usb_modeswitch.c	2013-08-20 12:37:27.415242925 +0200
+@@ -1968,7 +1968,8 @@ void printHelp()
+ 	" -g, --device-num NUM          system device number (for hard ID)\n"
+ 	" -m, --message-endpoint NUM    direct the message transfer there (optional)\n"
+ 	" -M, --message-content <msg>   message to send (hex number as string)\n"
+-	" -2 <msg>, -3 <msg>            additional messages to send (-n recommended)\n"
++	" -2, --message-content2 <msg>  additional messages to send (-n recommended)\n"
++	" -3, --message-content3 <msg>  additional messages to send (-n recommended)\n"
+ 	" -n, --need-response           read response to the message transfer (CSW)\n"
+ 	" -r, --response-endpoint NUM   read response from there (optional)\n"
+ 	" -d, --detach-only             detach the active driver, no further action\n"
+@@ -1989,10 +1990,11 @@ void printHelp()
+ 	" -B, --qisda-mode              apply a special procedure\n"
+ 	" -E, --quanta-mode             apply a special procedure\n"
+ 	" -R, --reset-usb               reset the device after all other actions\n"
++	" -w, --release-delay <seconds> delay releasing the interface\n"
+ 	" -Q, --quiet                   don't show progress or error messages\n"
+ 	" -W, --verbose                 print all settings and debug output\n"
+ 	" -D, --sysmode                 specific result and syslog message\n"
+-	" -s, --success <seconds>       switching result check with timeout\n"
++	" -s, --check-success <seconds> switching result check with timeout\n"
+ 	" -I, --no-inquire              do not get SCSI attributes (default on)\n\n"
+ 	" -c, --config-file <filename>  load long configuration from file\n\n"
+ 	" -t, --stdinput                read long configuration from stdin\n\n"
+diff -up usb-modeswitch-1.2.7/usb_modeswitch_dispatcher.1.fix-manual-pages usb-modeswitch-1.2.7/usb_modeswitch_dispatcher.1
+--- usb-modeswitch-1.2.7/usb_modeswitch_dispatcher.1.fix-manual-pages	2013-08-20 11:59:15.467713141 +0200
++++ usb-modeswitch-1.2.7/usb_modeswitch_dispatcher.1	2013-08-20 12:57:51.913947292 +0200
+@@ -0,0 +1,18 @@
++.TH "USB_MODESWITCH_DISPATCHER" "1"
++.SH "NAME"
++usb_modeswitch_dispatcher - dispatcher not intended for direct invocation.
++.SH "SYNOPSIS"
++.PP
++\fBusb_modeswitch_dispatcher\fR
++.SH "DESCRIPTION"
++.PP
++usb_modeswitch_dispatcher is doing additional device checking and
++using the usb_modeswitch binary to switch with the selected device config file.
++If no drivers are taking care of the device after the mode switch, the dispatcher
++will try to load and bind the "option" serial driver, in order to make the device
++usable.
++.PP
++This program is called by udev and is not supposed to be called directly
++by the user.
++.SH SEE ALSO
++.BR usb_modeswitch(1).

sources

@@ -1,2 +1 @@
-18d889d72195534ae9133a8181cad42b  usb-modeswitch-1.2.7.tar.bz2
-dd14f254f6c3642ce16fd7c2f43ee112  device_reference.txt
+e48d4419d0574d342bb183f7465556d0  usb-modeswitch-2.0.1.tar.bz2

usb_modeswitch-dir.patch

@@ -1,12 +0,0 @@
-diff -Naur usb-modeswitch-1.1.2/Makefile usb-modeswitch-1.1.2.dir/Makefile
---- usb-modeswitch-1.1.2/Makefile	2010-04-17 23:57:11.000000000 +0530
-+++ usb-modeswitch-1.1.2.dir/Makefile	2010-04-20 10:28:04.345041264 +0530
-@@ -7,7 +7,7 @@
- PREFIX      = $(DESTDIR)/usr
- ETCDIR      = $(DESTDIR)/etc
- UDEVDIR     = $(DESTDIR)/lib/udev
--SBINDIR     = $(PREFIX)/sbin
-+SBINDIR     = $(PREFIX)/bin
- MANDIR      = $(PREFIX)/share/man/man1
- 
- .PHONY:     clean

usb_modeswitch.spec

@@ -1,17 +1,23 @@
 %define source_name	usb-modeswitch
 
 Name:		usb_modeswitch
-Version:	1.2.7
-Release:	1%{?dist}
+Version:	2.0.1
+Release:	2%{?dist}
 Summary:	USB Modeswitch gets mobile broadband 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
 Source1:	http://www.draisberghof.de/usb_modeswitch/device_reference.txt
+
+Patch0: rhbz948451-fix-manual-pages.patch
+
+BuildRequires:	libusbx-devel
+BuildRequires:	jimtcl-devel
+BuildRequires:	systemd-devel
 Requires:	usb_modeswitch-data >= 20121109
-BuildRequires:	libusb-devel
 
 %description
 USB Modeswitch brings up your datacard into operational mode. When plugged
@@ -29,20 +35,23 @@ Vodafone, Option, ZTE und Novatell werden unterstützt.
 
 %prep
 %setup -q -n %{source_name}-%{version}
-cp -f %{SOURCE1} device_reference.txt   
+
+%patch0 -p1 -b .manpage
+
+cp -f %{SOURCE1} device_reference.txt
 
 # convert device_reference.txt encoding to UTF-8
 iconv --from=ISO-8859-1 --to=UTF-8 device_reference.txt > device_reference.txt.new && \
 touch -r device_reference.txt device_reference.txt.new && \
+chmod 644 device_reference.txt && \
 mv device_reference.txt.new device_reference.txt
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} static
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/udev/rules.d/
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -51,21 +60,37 @@ install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_sbindir}/
 install -p -m 755 usb_modeswitch_dispatcher $RPM_BUILD_ROOT%{_sbindir}/usb_modeswitch_dispatcher
 install -p -m 644 usb_modeswitch.conf $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.sh $RPM_BUILD_ROOT%{_libdir}/udev/usb_modeswitch
-
+gzip -9c usb_modeswitch_dispatcher.1 > usb_modeswitch_dispatcher.1.gz && install -m 644 usb_modeswitch_dispatcher.1.gz $RPM_BUILD_ROOT%{_datadir}/man/man1
+install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT%{_prefix}/lib/udev/usb_modeswitch
 
 
 %files
-%defattr(-,root,root,-)
 %{_sbindir}/usb_modeswitch
 %{_sbindir}/usb_modeswitch_dispatcher
 %{_mandir}/man1/usb_modeswitch.1.gz
-%{_libdir}/udev/usb_modeswitch
+%{_mandir}/man1/usb_modeswitch_dispatcher.1.gz
+%{_prefix}/lib/udev/usb_modeswitch
 %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf
 %doc COPYING README ChangeLog device_reference.txt 
 
 
 %changelog
+* Tue Jan 28 2014 Dan Williams <dcbw@redhat.com> - 2.0.1-2
+- Resurrect manpage patch
+
+* Mon Jan  6 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.0.1-1
+- Update to 2.0.1 and build against libusbx (RHBZ 994974)
+- Use distro jimtcl (RHBZ 967314)
+- Fix build on aarch64
+- Cleanup and modernise spec
+
+* Wed Aug 28 2013 Thomas Haller <thaller@redhat.com> 1.2.7-3
+- Add manual page for usb_modeswitch_dispatcher and fix errors in
+  manual page of usb_modeswitch (rhbz#948451, rhbz#884203).
+
+* Mon Aug 26 2013 Dan Williams <dcbw@redhat.com> - 1.2.7-2
+- Fix udev helper path
+
 * Fri Aug 16 2013 Dan Williams <dcbw@redhat.com> - 1.2.7-1
 - New upstream release
 
@@ -116,68 +141,3 @@ install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT%{_libdir}/udev/usb_modeswitc
 
 * Thu Dec 30 2010 Dan Williams <dcbw@redhat.com> 1.1.6-1
 - New upstream version
-
-* Tue Aug 24 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.4-1
-- New upstream version
-
-* Tue Jun 22 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.3-1
-- New upstream
-
-* Fri Apr 23 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.1.2-3
-- Fix typo in binary location
-
-* 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
-
-* Mon Mar 8 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.1.0-6
-- Version bump for F-12 build
-
-* Sat Mar 6 2010 Huzaifa Sidhpurwala <huzaifas@redaht.com> - 1.1.0-5
-- Fix regression in rhbz #571001
-- Version bump
-
-* 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
-
-* Tue Mar 2 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.0-2
-- Reload udev when new rules are installed
-
-* Tue Mar 2 2010 Huzaifa Sidhpurwala <huzaifas@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@gmail.com> 1.0.5-1
-- new upstream 1.0.5 release
-
-* Sun Aug 02 2009 Robert M. Albrecht <fedora@romal.de> 1.0.2-1
-- new upstream release
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Jan 11 2009 Robert M. Albrecht <fedora@romal.de> 0.9.6-1
-* new upstream release
-
-* Sat Dec 13 2008 Robert M. Albrecht <fedora@romal.de> 0.9.5-1
-* new upstream release
-
-* Sun Jun 22 2008 Robert M. Albrecht <romal@gmx.de> 0.9.4-2
-- Fixed some rpmlint errors
-- Added german translation
-
-* Sun Jun 22 2008 Robert M. Albrecht <romal@gmx.de> 0.9.4-1
-- Update to 0.9.4
-- Honor RPM_OPT_FLAGS
-  
-* Mon May 26 2008 Robert M. Albrecht <romal@gmx.de> 0.9.4-0.1.beta2
-- First package Release
-