rebuilt with specfile fixes [release 2.6.2-2mamba;Thu Feb 05 2026]

usb-modeswitch-1.1.9-dispatcher_fix_usb_coldplug.patch

@@ -1,51 +0,0 @@
-diff -Nru usb-modeswitch-1.1.9.orig/usb_modeswitch.tcl usb-modeswitch-1.1.9/usb_modeswitch.tcl
---- usb-modeswitch-1.1.9.orig/usb_modeswitch.tcl	2011-08-05 23:40:30.000000000 +0200
-+++ usb-modeswitch-1.1.9/usb_modeswitch.tcl	2011-09-28 20:56:40.235554246 +0200
-@@ -85,30 +85,35 @@
- # providing these attributes - or not. So more probing
- # is needed
- 
--if {[string length [lindex $argList 0]] == 0} {
-+set devdir ""
-+
-+if {![string length [lindex $argList 0]] == 0} {
-+	set dev_top [lindex $argList 0]
-+	if {[regexp {(.*?):} $dev_top d dev_top]} {
-+		set devdir /sys/bus/usb/devices/$dev_top
-+	}
-+}
-+
-+if {$devdir eq "" || ![file isdirectory $devdir]} {
-+	Log "Top sysfs directory not found using bus id or bus id not given ($devdir); trying with kernel name!"
- 	if {[string length [lindex $argList 1]] == 0} {
- 		Log "No device number values given from udev! Exiting"
- 		SafeExit
- 	} else {
--		Log "Bus ID for device not given by udev."
- 		Log " Trying to determine it from kernel name ([lindex $argList 1]) ..."
- 		if {![regexp {(.*?):} [lindex $argList 1] d dev_top]} {
- 			Log "Could not determine top device dir from udev values! Exiting"
- 			SafeExit
- 		}
-+		set devdir /sys/bus/usb/devices/$dev_top
-+		if {![file isdirectory $devdir]} {
-+			Log "Top sysfs directory not found ($devdir)! Exiting"
-+			SafeExit
-+		}
- 	}
--} else {
--	set dev_top [lindex $argList 0]
--	regexp {(.*?):} $dev_top d dev_top
--}
--
--
--set devdir /sys/bus/usb/devices/$dev_top
--if {![file isdirectory $devdir]} {
--	Log "Top sysfs directory not found ($devdir)! Exiting"
--	SafeExit
- }
- 
-+Log "Top sysfs directory found ($devdir)"
- 
- # Mapping of the short string identifiers (in the config
- # file names) to the long name used here

usb-modeswitch-2.0.1-systemctl_path.patch

@@ -1,24 +0,0 @@
-diff -Nru usb-modeswitch-2.0.1.orig/Makefile usb-modeswitch-2.0.1/Makefile
---- usb-modeswitch-2.0.1.orig/Makefile	2013-09-03 19:22:05.000000000 +0200
-+++ usb-modeswitch-2.0.1/Makefile	2013-09-13 15:12:16.343639973 +0200
-@@ -85,7 +85,7 @@
- 	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
- 	install -d $(DESTDIR)/var/lib/usb_modeswitch
- 	test -d $(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(UPSDIR) || test 1
--	test -d $(SYSDIR) -a -e /usr/bin/systemctl && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
-+	test -d $(SYSDIR) -a -e /bin/systemctl && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
- 
- install: install-script
- 
-diff -Nru usb-modeswitch-2.0.1.orig/usb_modeswitch.sh usb-modeswitch-2.0.1/usb_modeswitch.sh
---- usb-modeswitch-2.0.1.orig/usb_modeswitch.sh	2013-09-03 19:21:08.000000000 +0200
-+++ usb-modeswitch-2.0.1/usb_modeswitch.sh	2013-09-13 15:12:30.847532159 +0200
-@@ -84,7 +84,7 @@
- 		if [ -e "/etc/init/usb-modeswitch-upstart.conf" ]; then
- 			exec /sbin/initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
- 		elif [ -e "/etc/systemd/system/usb_modeswitch@.service" ]; then
--			exec /usr/bin/systemctl --no-block start usb_modeswitch@$1.service
-+			exec /bin/systemctl --no-block start usb_modeswitch@$1.service
- 		else
- 			exec /usr/sbin/usb_modeswitch_dispatcher --switch-mode $1 &
- 		fi

usb-modeswitch.spec

@@ -1,23 +1,20 @@
 Name:          usb-modeswitch
 Version:       2.6.2
-Release:       1mamba
+Release:       2mamba
 Summary:       USB-ModeSwitch is a mode switching tool for controlling "flip flop" (multiple device) USB gear
 Group:         Applications/Networking
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>
+Packager:      Silvan Calarco <silvan@openmamba.org>
 URL:           https://www.draisberghof.de/usb_modeswitch/
 Source:        http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-%{version}.tar.bz2
-Patch0:        %{name}-1.1.9-dispatcher_fix_usb_coldplug.patch
-Patch1:        usb-modeswitch-2.0.1-systemctl_path.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libusb-devel
 ## AUTOBUILDREQ-END
-BuildRequires: systemd-core
 Provides:      usb_modeswitch
-Obsoletes:     usb_modeswitch
+Obsoletes:     usb_modeswitch < 2.6.2-1mamba
 Requires:      usb-modeswitch-data
 
 %description
@@ -27,12 +24,16 @@ USB-ModeSwitch is a mode switching tool for controlling "flip flop" (multiple de
 %setup -q
 
 %build
-%make CC=%{_host}-gcc
+%make \
+   CC=%{_host}-gcc \
+   SBINDIR=%{_bindir}
 
-[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %install
-install -d %{buildroot}{%{_mandir}/man1,/lib/udev,%{_sysconfdir}}
-%makeinstall
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+
+%makeinstall \
+   SBINDIR=%{buildroot}%{_bindir} \
+   UDEVDIR=%{buildroot}%{_prefix}/lib/udev
 
 # don't install in /lib/systemd 
 install -D -m0644 usb_modeswitch@.service %{buildroot}%{_sysconfdir}/systemd/system/usb_modeswitch@.service
@@ -44,14 +45,18 @@ install -D -m0644 usb_modeswitch@.service %{buildroot}%{_sysconfdir}/systemd/sys
 %defattr(-,root,root)
 %{_sysconfdir}/usb_modeswitch.conf
 %{_sysconfdir}/systemd/system/usb_modeswitch@.service
-%{_sbindir}/usb_modeswitch
-%{_sbindir}/usb_modeswitch_dispatcher
-/lib/udev/usb_modeswitch
+%{_bindir}/usb_modeswitch
+%{_bindir}/usb_modeswitch_dispatcher
+%{_prefix}/lib/udev/usb_modeswitch
 %{_mandir}/man1/usb_modeswitch.1*
 %{_mandir}/man1/usb_modeswitch_dispatcher.1*
 %dir %{_localstatedir}/lib/usb_modeswitch
+%doc COPYING
 
 %changelog
+* Thu Feb 05 2026 Silvan Calarco <silvan@openmamba.org> 2.6.2-2mamba
+- rebuilt with specfile fixes
+
 * Thu Feb 20 2025 Automatic Build System <autodist@openmamba.org> 2.6.2-1mamba
 - automatic version update by autodist