From 97577a715839cb9d6910e2c15dcd0a7e37c990cb Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 22 Oct 2024 14:25:32 +0200
Subject: [PATCH 1/7] Update to 018

---
 sources       |  2 +-
 usbutils.spec | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sources b/sources
index a54e66b..2c6d6a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (usbutils-017.tar.xz) = eaebbc82eee4d940898f7a8de95ca49846c7c964e65c3d866b38735f8f3c8ccfed2b3a536bf2ef39a835a40a34c2273ac4d82b1012d0c693d4863cff14870d95
+SHA512 (usbutils-018.tar.xz) = 4f76c7a328746e17892c31d69cbd9a560c4384877e18d80076cef344a25b71b33387d803c98a9c6867b357a61e1a8a1a630884afe32128c3b6393dc186f216c8
diff --git a/usbutils.spec b/usbutils.spec
index 7e78f27..27dfefd 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,5 +1,5 @@
 Name:    usbutils
-Version: 017
+Version: 018
 Release: %autorelease
 Summary: Linux USB utilities
 URL:     http://www.linux-usb.org/
@@ -7,7 +7,7 @@ License: GPL-2.0-or-later
 
 Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
 
-BuildRequires: make
+BuildRequires: meson
 BuildRequires: gcc
 BuildRequires: libusb1-devel
 BuildRequires: systemd-devel
@@ -21,11 +21,11 @@ USB bus.
 %autosetup -p1
 
 %build
-%configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids
-%make_build
+%meson --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata
+%meson_build
 
 %install
-%make_install
+%meson_install
 rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
 
 %files

From 2702e75256d4ddc807000b3feb6bddb1ff66019e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 13:57:35 +0000
Subject: [PATCH 2/7] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 93afe3bd89229f7a547010b7b0bca9aac44bba87 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Fri, 14 Mar 2025 09:29:00 +0100
Subject: [PATCH 3/7] add usbreset (but in Fedora only)

---
 usbreset.patch | 22 ++++++++++++++++++++++
 usbutils.spec  |  6 ++++++
 2 files changed, 28 insertions(+)
 create mode 100644 usbreset.patch

diff --git a/usbreset.patch b/usbreset.patch
new file mode 100644
index 0000000..15a2f80
--- /dev/null
+++ b/usbreset.patch
@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index c522283..f6bd530 100644
+--- a/meson.build
++++ b/meson.build
+@@ -76,7 +76,7 @@ add_project_arguments('-include', 'config.h', language : 'c')
+ #####################
+ # man page generation
+ #####################
+-install_man(['man/lsusb.8', 'man/lsusb.py.1', 'man/usb-devices.1', 'man/usbhid-dump.8'])
++install_man(['man/lsusb.8', 'man/lsusb.py.1', 'man/usb-devices.1', 'man/usbhid-dump.8', 'man/usbreset.1'])
+ 
+ 
+ ##########################
+@@ -137,7 +137,7 @@ usbreset_sources = [
+ 
+ # By default, usbreset does not get installed as it could cause problems, it's
+ # in the repo for those that wish to try it out.
+-executable('usbreset', usbreset_sources, install: false)
++executable('usbreset', usbreset_sources, install: true)
+ 
+ 
+ ################################
diff --git a/usbutils.spec b/usbutils.spec
index 27dfefd..78bb724 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -7,6 +7,12 @@ License: GPL-2.0-or-later
 
 Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
 
+# This adds usbreset binary to the package, but since upstream does not consider it stable, 
+# let's not include it in the ELN. https://github.com/gregkh/usbutils/issues/222#issuecomment-2715192013
+%if 0%{?fedora}
+Patch0: usbreset.patch
+%endif
+
 BuildRequires: meson
 BuildRequires: gcc
 BuildRequires: libusb1-devel

From 00e2a49eefe0f750ba88ded131c8564e1c43b0cf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 19:53:10 +0000
Subject: [PATCH 4/7] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 97d149ff9f78ad90c51ae538cd952a22730d63de Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 6 Jan 2026 14:36:39 +0100
Subject: [PATCH 5/7] Update to 019

---
 sources       | 2 +-
 usbutils.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 2c6d6a0..8550f5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (usbutils-018.tar.xz) = 4f76c7a328746e17892c31d69cbd9a560c4384877e18d80076cef344a25b71b33387d803c98a9c6867b357a61e1a8a1a630884afe32128c3b6393dc186f216c8
+SHA512 (usbutils-019.tar.xz) = fb4acc570c2b71f90c51c2717dc80e844727c8fcfebb5d92c57145eb9d09cbd1f63cf405e07db76c3afaaf3fac87b90f3f512d0a7c4d50cb9e6f26438eca9390
diff --git a/usbutils.spec b/usbutils.spec
index 78bb724..8be5e9d 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,5 +1,5 @@
 Name:    usbutils
-Version: 018
+Version: 019
 Release: %autorelease
 Summary: Linux USB utilities
 URL:     http://www.linux-usb.org/

From 63dfef4e1e442d3a0e1a6803cd5a53ac9d11ecab Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 19:42:20 +0000
Subject: [PATCH 6/7] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild


From 47080022c80396df64a66e67f355da51eb92a2f9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 08:16:56 +0000
Subject: [PATCH 7/7] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild