Compare commits

..

2 commits

Author SHA1 Message Date
Jan Macku
f63aca95c7 update sources 2024-01-17 16:19:54 +01:00
Jan Macku
5f1ce4c640 Update to 017 2024-01-17 16:09:37 +01:00
3 changed files with 6 additions and 34 deletions

View file

@ -1 +1 @@
SHA512 (usbutils-019.tar.xz) = fb4acc570c2b71f90c51c2717dc80e844727c8fcfebb5d92c57145eb9d09cbd1f63cf405e07db76c3afaaf3fac87b90f3f512d0a7c4d50cb9e6f26438eca9390
SHA512 (usbutils-017.tar.xz) = eaebbc82eee4d940898f7a8de95ca49846c7c964e65c3d866b38735f8f3c8ccfed2b3a536bf2ef39a835a40a34c2273ac4d82b1012d0c693d4863cff14870d95

View file

@ -1,22 +0,0 @@
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)
################################

View file

@ -1,5 +1,5 @@
Name: usbutils
Version: 019
Version: 017
Release: %autorelease
Summary: Linux USB utilities
URL: http://www.linux-usb.org/
@ -7,13 +7,7 @@ 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: make
BuildRequires: gcc
BuildRequires: libusb1-devel
BuildRequires: systemd-devel
@ -27,11 +21,11 @@ USB bus.
%autosetup -p1
%build
%meson --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata
%meson_build
%configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids
%make_build
%install
%meson_install
%make_install
rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
%files