Compare commits

...

No commits in common. "imports/c9/usb_modeswitch-2.6.1-4.el9" and "c8s" have entirely different histories.

4 changed files with 38 additions and 49 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/usb-modeswitch-2.6.1.tar.bz2
SOURCES/usb-modeswitch-2.5.2.tar.bz2

View File

@ -1 +1 @@
ddf2b214488aa63e7e390d1ed0113b66262af343 SOURCES/usb-modeswitch-2.6.1.tar.bz2
620eaeb989c40182ebc46df0fcaf11ac2226b9c0 SOURCES/usb-modeswitch-2.5.2.tar.bz2

View File

@ -0,0 +1,26 @@
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

View File

@ -1,10 +1,11 @@
%define source_name usb-modeswitch
Name: usb_modeswitch
Version: 2.6.1
Release: 4%{?dist}
Version: 2.5.2
Release: 1%{?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/
@ -13,12 +14,11 @@ Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt
# Submitted upstream (2014-11-24)
Patch0: device_reference-utf8.patch
# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733
Patch1: 0001-usb_modeswitch-count-the-target-devices-from-zero.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: libusbx-devel
# "tcl" or "jimsh"), use the light-weight installation:
#BuildRequires: jimtcl-devel
BuildRequires: jimtcl-devel
BuildRequires: systemd
Requires: usb_modeswitch-data >= 20121109
Requires: systemd
@ -42,18 +42,18 @@ Vodafone, Option, ZTE und Novatell werden unterstützt.
cp -f %{SOURCE1} device_reference.txt
%patch0 -p0
%patch1 -p1
%build
%{set_build_flags}
# this will require jimtcl-devel
#make_build all-with-dynlink-dispatcher
%make_build
make %{?_smp_mflags}
%install
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
%make_install \
make install \
DESTDIR=$RPM_BUILD_ROOT \
SYSDIR=$RPM_BUILD_ROOT%{_unitdir} \
UDEVDIR=$RPM_BUILD_ROOT%{_prefix}/lib/udev
@ -70,43 +70,6 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir}
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.6.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.6.1-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Nov 18 2020 Sérgio Basto <sergio@serjux.com> - 2.6.1-1
- Update usb_modeswitch to 2.6.1
- Drop patch1, http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733
- Drop BR jimtcl-devel, if we don't install dynlink-dispatcher
* Tue Sep 29 2020 Sérgio Basto <sergio@serjux.com> - 2.6.0-3
- Use make macros (https://src.fedoraproject.org/rpms/usb_modeswitch/pull-request/1)
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Mar 24 2020 Lubomir Rintel <lkundrak@v3.sk> - 2.6.0-1
- New 2.6.0 release
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 28 2018 Lubomir Rintel <lkundrak@v3.sk> - 2.5.2-1
- New 2.5.2 release