!3 Upgrade to 2.6.1

From: @starlet-dx 
Reviewed-by: @wu-leilei 
Signed-off-by: @wu-leilei
This commit is contained in:
openeuler-ci-bot 2023-10-20 03:19:14 +00:00 committed by Gitee
commit 2edf57c7c9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 10 additions and 32 deletions

View File

@ -1,26 +0,0 @@
From 99cade3624c432a478e624f278692cdedf4e0450 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 18 Aug 2017 10:40:41 +0200
Subject: [PATCH] usb_modeswitch: count the target devices from zero
Most likely a typo here.
---
usb_modeswitch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usb_modeswitch.c b/usb_modeswitch.c
index 3239946..1b3bf9d 100644
--- a/usb_modeswitch.c
+++ b/usb_modeswitch.c
@@ -1582,7 +1582,7 @@ int checkSuccess()
* description is read for syslog message
*/
// Wait counter passed on from previous loop
- for (i=i; i < CheckSuccess; i++) {
+ for (i=0; i < CheckSuccess; i++) {
SHOW_PROGRESS(output," Search for target devices ...\n");
dev = search_devices(&newTargetCount, TargetVendor, TargetProductList,
TargetClass, 0, SEARCH_TARGET);
--
2.14.3

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: usb_modeswitch
Version: 2.5.2
Release: 4
Version: 2.6.1
Release: 1
Summary: A mode switching tool for controlling multiple-device USB gear
License: GPLv2+
URL: http://www.draisberghof.de/usb_modeswitch/
@ -9,9 +9,8 @@ Source0: http://www.draisberghof.de/%{name}/usb-modeswitch-%{version}.tar.bz2
Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt
Patch0: 0000-device_reference-utf8.patch
Patch1: 0001-usb_modeswitch-count-the-target-devices-from-zero.patch
BuildRequires: gcc libusbx-devel jimtcl-devel systemd
BuildRequires: gcc libusbx-devel tcl-devel systemd
Requires: usb_modeswitch-data >= 20121109 systemd
%description
@ -33,8 +32,6 @@ the need for shipping a separate driver carrier.
cp -f %{SOURCE1} device_reference.txt
%patch0 -p0
%patch1 -p1
%build
%{set_build_flags}
@ -59,5 +56,8 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir}
%{_mandir}/man*/
%changelog
* Mon Oct 09 2023 yaoxin <yao_xin001@hoperun.com> - 2.6.1-1
- Upgrade to 2.6.1
* Sat Nov 9 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.5.2-4
- Package init

4
usb_modeswitch.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: NA
src_repo: NA
tag_prefix: NA
separator: NA