From 80331ece0f63e7693924db492b385a33335c4a17 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Thu, 24 Aug 2023 19:34:56 +0200
Subject: [PATCH] Cleanup spec: use %license, use %patch 0

- Use spdx license specifier
- Remove unused patch
---
 ...h-count-the-target-devices-from-zero.patch | 26 -------------------
 usb_modeswitch.spec                           | 11 +++++---
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 0001-usb_modeswitch-count-the-target-devices-from-zero.patch

diff --git a/0001-usb_modeswitch-count-the-target-devices-from-zero.patch b/0001-usb_modeswitch-count-the-target-devices-from-zero.patch
deleted file mode 100644
index 822ee72..0000000
--- a/0001-usb_modeswitch-count-the-target-devices-from-zero.patch
+++ /dev/null
@@ -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
-
diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec
index d8dc392..1e8ca40 100644
--- a/usb_modeswitch.spec
+++ b/usb_modeswitch.spec
@@ -2,7 +2,7 @@
 
 Name:		usb_modeswitch
 Version:	2.6.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	USB Modeswitch gets mobile broadband cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
 License:	GPLv2+
@@ -41,7 +41,7 @@ Vodafone, Option, ZTE und Novatell werden unterstützt.
 %setup -q -n %{source_name}-%{version}
 cp -f %{SOURCE1} device_reference.txt
 
-%patch0 -p0
+%patch 0 -p0
 
 
 %build
@@ -66,10 +66,15 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 %{_prefix}/lib/udev/usb_modeswitch
 %{_unitdir}/usb_modeswitch@.service
 %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf
-%doc COPYING README ChangeLog device_reference.txt 
+%doc README ChangeLog device_reference.txt
+%license COPYING
 
 
 %changelog
+* Thu Aug 24 2023 Till Maas <opensource@till.name> - 2.6.1-8
+- Cleanup spec: use %%license, use %%patch 0
+- Use spdx license specifier
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild