diff --git a/sources b/sources index a54e66b..8550f5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbutils-017.tar.xz) = eaebbc82eee4d940898f7a8de95ca49846c7c964e65c3d866b38735f8f3c8ccfed2b3a536bf2ef39a835a40a34c2273ac4d82b1012d0c693d4863cff14870d95 +SHA512 (usbutils-019.tar.xz) = fb4acc570c2b71f90c51c2717dc80e844727c8fcfebb5d92c57145eb9d09cbd1f63cf405e07db76c3afaaf3fac87b90f3f512d0a7c4d50cb9e6f26438eca9390 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 7e78f27..8be5e9d 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,5 +1,5 @@ Name: usbutils -Version: 017 +Version: 019 Release: %autorelease Summary: Linux USB utilities URL: http://www.linux-usb.org/ @@ -7,7 +7,13 @@ License: GPL-2.0-or-later Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz -BuildRequires: make +# 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 BuildRequires: systemd-devel @@ -21,11 +27,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