Accepting request 318391 from home:weberho:branches:hardware

- Update to version 2.2.5
- Update the data package to version 20150627
- Cleaned up specfile
- Removed unused usb_modeswitch-data.rpmlintrc
- Removed changelog from documentation

OBS-URL: https://build.opensuse.org/request/show/318391
OBS-URL: https://build.opensuse.org/package/show/hardware/usb_modeswitch?expand=0&rev=67

usb-modeswitch-2.2.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37d926a0b6b6d490173c57e260a69aca49feb774875fc8f2001c1d0f5e8011cb
-size 261872

usb-modeswitch-2.2.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b2340303732aabc8c8e1cdd7d4352f61dcb942839f58ce22ba0ecfa122426d5
+size 263335

usb-modeswitch-data-20150115.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90549f589835a68279369c3dc0d47eb7338ee3bad09d737e7b85e1ab15bd2d8b
-size 28971

usb-modeswitch-data-20150627.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:826096cb35a487c6e924b1318074988457220b5e72812e5393597950dd9eefc2
+size 29918

usb_modeswitch-data.rpmlintrc

@@ -1 +0,0 @@
-addFilter("non-conffile-in-etc /etc/usb_modeswitch.d/")

usb_modeswitch.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Fri Jul 24 09:34:00 UTC 2015 - jweberhofer@weberhofer.at
+
+- Removed unused usb_modeswitch-data.rpmlintrc
+
+- Removed changelog from documentation
+
+- Cleaned up specfile
+
+- Update to version 2.2.5
+  * Fixed bug in configuration check, possibly leading to segfault (thanks,
+    Leonid Lisovskiy); 
+  * fixed Pantech commandline parameter evaluation (was not working at all);
+  * added driver unbind step via sysfs in wrapper, getting rid of the
+    USB subsystem complaint "interface 0 claimed by usb-storage while
+    'usb_modeswitch' <does this and that>"
+- Update to version 2.2.4
+  * Fixed buggy check of USB configuration selection (possibly leading
+    to segfault), tested with Alcatel X602D;
+  * removed call to 'libusb_strerror'
+    from libusb initialization - not available in earlier libusb1 versions
+- Update to version 2.2.3
+  * Fixed problem arising with systemd version 221 (220 untested), which
+    affects starting the usb_modeswitch systemd unit from the sh script
+    (reported by Archlinux users)
+- Update to version 2.2.2, 2015/06/27
+  * Added catch for libusb init error (thanks, Henrik Gustafsson);
+  * removed global function result variable; added catch for USB configuration
+    read error (both thanks to "otila"); 
+  * fixed wrapper script where port search for symlinking modem port was
+    broken ("/dev/gsmmodem");
+  * changed PantechMode parameter to represent different targets;
+  * added global config option to disable MBIM checking and setting 
+    alltogether (request from "kai");
+  * changed udev sh script so that systemd processing takes precedence over
+    upstart;
+  * changed systemd template unit parameter to avoid escaping problems
+
+- Update the data package to version 20150627
+
 -------------------------------------------------------------------
 Sat Apr 25 08:17:32 UTC 2015 - coolo@suse.com
 

usb_modeswitch.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package usb_modeswitch
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,30 +15,29 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+%define source_name	usb-modeswitch
+%define date		20150627
+%define _udevdir %(pkg-config --variable=udevdir udev)
 Name:           usb_modeswitch
-Version:        2.2.1
+Version:        2.2.5
 Release:        0
 Summary:        A mode switching tool for controlling multiple-device USB gear
 License:        GPL-2.0+
 Group:          Hardware/Mobile
 Url:            http://www.draisberghof.de/usb_modeswitch
-%define source_name	usb-modeswitch
-%define date		20150115
 Source0:        http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2
 Source1:        http://www.draisberghof.de/usb_modeswitch/%{source_name}-data-%{date}.tar.bz2
 Source2:        http://www.draisberghof.de/usb_modeswitch/device_reference.txt
-Source1000:     %{name}-data.rpmlintrc
 Patch1:         usb_modeswitch-fix_fsf_address.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes
 BuildRequires:  pkg-config
 BuildRequires:  tcl
-BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(libusb-1.0)
+BuildRequires:  pkgconfig(udev)
 Requires:       tcl >= 8.4
-Requires:       usb_modeswitch-data = %version
-
-%define _udevdir %(pkg-config --variable=udevdir udev)
+Requires:       usb_modeswitch-data = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 USB_ModeSwitch is a mode switching tool for controlling "flip flop"
@@ -66,9 +65,9 @@ cp %{SOURCE2} .
 CFLAGS="%{optflags}" make
 
 %install
-%makeinstall UDEVDIR=$RPM_BUILD_ROOT%{_udevdir}
+make DESTDIR=%{buildroot} install %{?_smp_mflags} UDEVDIR=%{buildroot}%{_udevdir}
 cd %{source_name}-data-%{date}
-%makeinstall RULESDIR=$RPM_BUILD_ROOT%{_udevdir}/rules.d
+make DESTDIR=%{buildroot} install %{?_smp_mflags} RULESDIR=%{buildroot}%{_udevdir}/rules.d
 
 ### TO REMOVE ONCE IN UPSTREAM DATA PACKAGE, FIX BNC 899013 ###
 
@@ -92,15 +91,15 @@ EOF
 
 ### END SECTION TO REMOVE ###
 
-%fdupes -s $RPM_BUILD_ROOT
+%fdupes -s %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING ChangeLog device_reference.txt
+%doc README COPYING device_reference.txt
 %{_sbindir}/usb_modeswitch
 %{_sbindir}/usb_modeswitch_dispatcher
 %{_udevdir}/usb_modeswitch
-/var/lib/usb_modeswitch
+%{_localstatedir}/lib/usb_modeswitch
 %config %{_sysconfdir}/usb_modeswitch.conf
 %{_mandir}/man1/usb_modeswitch.1.gz
 %{_mandir}/man1/usb_modeswitch_dispatcher.1.gz