Compare commits

...
Sign in to create a new pull request.

62 commits

Author SHA1 Message Date
Fedora Release Engineering
47080022c8 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:16:56 +00:00
Fedora Release Engineering
63dfef4e1e Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 19:42:20 +00:00
Jan Macku
97d149ff9f Update to 019 2026-01-06 14:43:55 +01:00
Fedora Release Engineering
00e2a49eef Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:53:10 +00:00
Lukas Nykryn
93afe3bd89 add usbreset (but in Fedora only) 2025-03-14 09:48:43 +01:00
Fedora Release Engineering
2702e75256 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:57:35 +00:00
Lukas Nykryn
97577a7158 Update to 018 2024-10-22 14:25:32 +02:00
Fedora Release Engineering
c5649c6860 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:26:15 +00:00
Fedora Release Engineering
82ab0edfea Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 07:19:10 +00:00
Jan Macku
d73574bbac Update to 017 2024-01-17 16:02:05 +01:00
Peter Robinson
3d0e811abe Update to 016 2023-10-29 14:39:35 +00:00
Fedora Release Engineering
a3f959ad68 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:17:37 +00:00
Lukáš Zaoral
702d4cf95c
migrate to SPDX license format 2023-04-11 17:29:18 +02:00
Fedora Release Engineering
e9296e71d9 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:59:19 +00:00
Jan Macku
ac347d96db Update to usbutils-015
Resolves: #2150489
2023-01-13 13:15:44 +01:00
Matthew Miller
a3047582da Convert to rpmautospec 2022-12-06 08:22:58 -05:00
Fedora Release Engineering
11c9ed6a05 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:33:53 +00:00
Fedora Release Engineering
ede58a2719 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:40:54 +00:00
Peter Robinson
9f04bb3d30 014 2021-08-11 09:21:45 +01:00
Fedora Release Engineering
1f9a607b89 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 20:11:44 +00:00
Fedora Release Engineering
8845d49195 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 22:48:43 +00:00
Tom Stellard
b6b8d47c20 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 00:30:21 +00:00
Peter Robinson
39ca8a790a v013 2020-10-29 08:41:58 +00:00
Fedora Release Engineering
a8785b205e - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:26:48 +00:00
Fedora Release Engineering
632b85a3a0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 02:48:09 +00:00
Fedora Release Engineering
414d26dd0b - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 02:40:26 +00:00
Peter Robinson
57cc4e883b add changelog 2019-05-12 13:25:12 +01:00
Peter Robinson
4c669d0d41 0.12 2019-05-12 13:06:51 +01:00
Fedora Release Engineering
d58c1a9dc0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 10:58:16 +00:00
Lukas Nykryn
c3b9cd58d0 add build requirement to gcc 2018-07-13 11:02:56 +02:00
Lukas Nykryn
0e4a3c2646 add missing BuildRequires 2018-07-13 10:48:21 +02:00
Lukas Nykryn
7ef37e8db4 Merge remote-tracking branch 'fedora/master' into rhel-8.0 2018-06-08 14:32:40 +02:00
Lukas Nykryn
d6510e2b16 add v010 upstream fixes 2018-06-08 14:28:23 +02:00
Lukas Nykryn
e4226cecd8 v010 2018-05-16 09:33:44 +02:00
Troy Dawson
407f68e61d Fedora 28 Mass Merge into rhel-8.0 - fed_hash: 1aacd25679 2018-05-04 06:29:42 +00:00
Fedora Release Engineering
1aacd25679 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 20:11:40 +00:00
Peter Robinson
c4935d9749 cleanup .gitignore 2017-12-04 03:08:20 +00:00
Peter Robinson
35592576d1 fix path 2017-12-04 02:59:45 +00:00
Peter Robinson
def3914d50 drop obsolete patches 2017-12-04 02:52:30 +00:00
Peter Robinson
3fb4ad2446 v009 2017-12-04 02:16:04 +00:00
Troy Dawson
19fb52973c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild fed_hash: 5ea2f00f7d 2017-09-25 13:17:17 +00:00
Release Configuration Management
190e13361f New branch setup 2017-09-23 02:52:16 +00:00
Fedora Release Engineering
5ea2f00f7d - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 09:54:21 +00:00
Fedora Release Engineering
96504e4d20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 21:05:50 +00:00
Fedora Release Engineering
f5b61b5167 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 16:50:43 +00:00
Peter Robinson
8bd081531f Don't ship usbutils pkgconfig file 2016-08-29 11:11:38 +01:00
Fedora Release Engineering
96fb13a79a - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 02:27:58 +00:00
Peter Robinson
ef3b1fb1cd Fix FTBFS, cleanup and modernise spec, use %%license 2015-07-19 12:42:35 +01:00
Dennis Gilmore
56bfd9828f - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 01:42:35 +00:00
Till Maas
cf22eecf06 Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
2015-02-21 22:21:10 +01:00
Lukas Nykryn
ac92498031 add new sources 2014-10-23 10:09:45 +02:00
Lukas Nykryn
5c8beef151 usbutils-008 2014-10-23 09:33:12 +02:00
df12b1ead9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 07:16:05 +00:00
Dennis Gilmore
16b004734d - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 22:05:21 -05:00
Dennis Gilmore
8c94d1fa1c - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 00:48:32 -05:00
Lukas Nykryn
fe14af939c usbutils-007 (#971757) 2013-06-17 12:33:30 +02:00
Lukas Nykryn
32eb76963e lsusb-t: make sure that interfaces are added to lists only once (#914929) 2013-02-26 15:03:01 +01:00
Dennis Gilmore
b0a0086593 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 20:34:26 -06:00
Dennis Gilmore
a4c66b6cee - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 21:11:18 -05:00
Lukas Nykryn
d031ca28c9 add new upstream tarball 2012-07-16 12:59:42 +02:00
Lukas Nykryn
ad04d9ed32 update to new upstream 006 2012-07-16 12:49:16 +02:00
Lukas Nykryn
71a2faac06 update to new upstream 005 2012-04-19 10:57:27 +02:00
9 changed files with 156 additions and 407 deletions

7
.gitignore vendored
View file

@ -1,6 +1 @@
usbutils-0.86.tar.gz
/usbutils-0.90.tar.gz
/usbutils-0.91.tar.gz
/usbutils-001.tar.gz
/usbutils-003.tar.gz
/usbutils-004.tar.gz
/usbutils-*.tar.xz

106
changelog Normal file
View file

@ -0,0 +1,106 @@
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 014-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 014-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Aug 11 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 014-1
- Update to 014
- Cleanup spec, licenses now shipped upstream
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 013-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 013-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Oct 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 013-1
- Update to 013
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 012-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 012-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 012-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun May 12 2019 Peter Robinson <pbrobinson@fedoraproject.org> 012-2
- New 012 release
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 010-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jun 08 2018 Lukas Nykryn <lnykryn@redhat.com> - 010-2
- add upstream fixes
* Wed May 16 2018 Lukas Nykryn <lnykryn@redhat.com> - 010-1
- New 010 release
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 009-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Dec 4 2017 Peter Robinson <pbrobinson@fedoraproject.org> 009-1
- New 009 release
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 008-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 008-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 008-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Aug 29 2016 Peter Robinson <pbrobinson@fedoraproject.org> 008-6
- Don't ship usbutils pkgconfig file
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 008-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sun Jul 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> 008-4
- Fix FTBFS, cleanup and modernise spec, use %%license
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 008-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 008-2
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
* Wed Oct 22 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 008-1
- new release
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Jun 17 2013 Lukáš Nykrýn <lnykryn@redhat.com> - 007-1
- new upstream release
* Tue Feb 26 2013 Lukáš Nykrýn <lnykryn@redhat.com> - 006-4
- lsusb-t: make sure that interfaces are added to lists only once (#914929)
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 006-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 006-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jul 16 2012 Lukáš Nykrýn <lnykryn@redhat.com> - 006-1
- new upstream release
* Thu Apr 19 2012 Lukas Nykryn <lnykryn@redhat.com> 005-1
- new upstream release
* Thu Apr 19 2012 Lukas Nykryn <lnykryn@redhat.com> 004-4
- Ignore missing driver symlink (#808934)
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 004-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

View file

@ -1 +1 @@
481e1de453bcabbd5f43125bb4df2ab7 usbutils-004.tar.gz
SHA512 (usbutils-019.tar.xz) = fb4acc570c2b71f90c51c2717dc80e844727c8fcfebb5d92c57145eb9d09cbd1f63cf405e07db76c3afaaf3fac87b90f3f512d0a7c4d50cb9e6f26438eca9390

22
usbreset.patch Normal file
View file

@ -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)
################################

View file

@ -1,79 +0,0 @@
--- usbutils-003/Makefile.am 2011-03-22 00:23:33.000000000 +0100
+++ usbutils-003_/Makefile.am 2011-06-16 15:41:20.927882420 +0200
@@ -4,15 +4,9 @@
AM_LDFLAGS = \
-Wl,--as-needed
-data_DATA = \
- usb.ids
-
bin_PROGRAMS = \
lsusb
-sbin_SCRIPTS = \
- update-usbids.sh
-
bin_SCRIPTS = \
usb-devices \
lsusb.py
@@ -27,37 +21,22 @@
lsusb_CPPFLAGS = \
$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
- -DDATADIR=\"$(datadir)\"
+ -DDATADIR=\"$(datadir)/hwdata\"
lsusb_LDADD = \
$(LIBUSB_LIBS)
-if HAVE_ZLIB
-data_DATA += usb.ids.gz
-lsusb_CPPFLAGS += -DHAVE_LIBZ
-lsusb_LDADD += -lz
-endif
-
man_MANS = \
lsusb.8 \
usb-devices.1
EXTRA_DIST = \
- usb.ids \
- update-usbids.sh.in \
lsusb.8.in \
usb-devices.1.in \
usb-devices \
lsusb.py \
usbutils.pc.in
-usb.ids.gz: $(srcdir)/usb.ids
- gzip -c -9 $< > $@
-
-update-usbids.sh: $(srcdir)/update-usbids.sh.in
- sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
- chmod 755 $@
-
lsusb.8: $(srcdir)/lsusb.8.in
sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
@@ -71,10 +50,8 @@
sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
DISTCLEANFILES = \
- usb.ids.gz \
lsusb.8 \
usb-devices.1 \
- update-usbids.sh \
usbutils.pc
distclean-local:
--- usbutils-003/lsusb.py 2010-12-16 01:07:09.000000000 +0100
+++ usbutils-003_/lsusb.py 2011-08-11 09:57:57.079327430 +0200
@@ -16,7 +16,7 @@
warnsort = False
prefix = "/sys/bus/usb/devices/"
-usbids = "/usr/share/usb.ids"
+usbids = "/usr/share/hwdata/usb.ids"
esc = chr(27)
norm = esc + "[0;0m"

View file

@ -1,50 +0,0 @@
From d63fa164a4ffebc5247acaa3b80b0d4f2e21d926 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Mon, 30 May 2011 17:19:47 +0200
Subject: [PATCH] don't use invalid config descriptors
This fixes "lsusb -v" crashing if device files are present but can't be
opened.
---
lsusb.c | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/lsusb.c b/lsusb.c
index 6ba2288..25dbc51 100644
--- a/lsusb.c
+++ b/lsusb.c
@@ -3800,14 +3800,25 @@ static void dumpdev(libusb_device *dev)
if (desc.bNumConfigurations) {
struct libusb_config_descriptor *config;
- libusb_get_config_descriptor(dev, 0, &config);
- otg = do_otg(config) || otg;
- libusb_free_config_descriptor(config);
+ ret = libusb_get_config_descriptor(dev, 0, &config);
+ if (ret) {
+ fprintf(stderr, "Couldn't get configuration descriptor 0, "
+ "some information will be missing\n");
+ } else {
+ otg = do_otg(config) || otg;
+ libusb_free_config_descriptor(config);
+ }
for (i = 0; i < desc.bNumConfigurations; ++i) {
- libusb_get_config_descriptor(dev, i, &config);
- dump_config(udev, config);
- libusb_free_config_descriptor(config);
+ ret = libusb_get_config_descriptor(dev, i, &config);
+ if (ret) {
+ fprintf(stderr, "Couldn't get configuration "
+ "descriptor %d, some information will "
+ "be missing\n", i);
+ } else {
+ dump_config(udev, config);
+ libusb_free_config_descriptor(config);
+ }
}
}
if (!udev)
--
1.7.5.4

View file

@ -1,37 +0,0 @@
diff --git a/lsusb-t.c b/lsusb-t.c
index 5438704..c8ab1b9 100644
--- a/lsusb-t.c
+++ b/lsusb-t.c
@@ -330,9 +330,7 @@ static void add_usb_interface(const char *d_name)
l = snprintf(link, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
if (l > 0 && l < MY_PATH_MAX) {
l = readlink(link, link, MY_PATH_MAX);
- if (l < 0)
- perror(d_name);
- else {
+ if (l >= 0) {
if (l < MY_PATH_MAX - 1)
link[l] = '\0';
else
@@ -395,9 +393,7 @@ static void add_usb_device(const char *d_name)
l = snprintf(link, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
if (l > 0 && l < MY_PATH_MAX) {
l = readlink(link, link, MY_PATH_MAX);
- if (l < 0)
- perror(d_name);
- else {
+ if (l >= 0) {
if (l < MY_PATH_MAX - 1)
link[l] = '\0';
else
@@ -418,9 +414,7 @@ static void get_roothub_driver(struct usbbusnode *b, const char *d_name)
l = snprintf(path, MY_PATH_MAX, "%s/%s/../driver", sys_bus_usb_devices, d_name);
if (l > 0 && l < MY_PATH_MAX) {
l = readlink(path, path, MY_PATH_MAX);
- if (l < 0)
- perror(d_name);
- else {
+ if (l >= 0) {
if (l < MY_PATH_MAX - 1)
path[l] = '\0';
else

View file

@ -1,21 +0,0 @@
diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am
--- usbutils-004/Makefile.am.orig 2011-09-20 09:42:04.282566870 +0200
+++ usbutils-004/Makefile.am 2011-09-20 09:42:41.399102845 +0200
@@ -38,7 +38,7 @@ EXTRA_DIST = \
usbutils.pc.in
lsusb.8: $(srcdir)/lsusb.8.in
- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/hwdata/usb.ids|g' $< >$@
usb-devices.1: $(srcdir)/usb-devices.1.in
sed 's|VERSION|$(VERSION)|g' $< >$@
@@ -47,7 +47,7 @@ pkgconfigdir = $(datarootdir)/pkgconfig
pkgconfig_DATA = usbutils.pc
usbutils.pc: $(srcdir)/usbutils.pc.in
- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
+ sed 's|@usbids@|$(datadir)/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
DISTCLEANFILES = \
lsusb.8 \

View file

@ -1,231 +1,44 @@
Name: usbutils
Version: 004
Release: 4%{?dist}
Source: http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz
URL: http://www.linux-usb.org/
License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: hwdata
BuildRequires: autoconf, libtool, libusb-devel >= 0.1.8, libusb1-devel
Name: usbutils
Version: 019
Release: %autorelease
Summary: Linux USB utilities
Group: Applications/System
Conflicts: hotplug < 3:2002_01_14-2
Patch0: usbutils-003-hwdata.patch
#Path to usb.ids should be with /hwdata/
Patch1: usbutils-make-hwdata.patch
Patch2: usbutils-005-readlink.patch
URL: http://www.linux-usb.org/
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
BuildRequires: systemd-devel
Requires: hwdata
%description
This package contains utilities for inspecting devices connected to a
USB bus.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
autoreconf
%autosetup -p1
%build
%configure --sbindir=%{_sbindir}
make %{?_smp_mflags}
%meson --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata
%meson_build
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%meson_install
rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
%files
%defattr(-,root,root,-)
%license LICENSES/GPL*
%doc NEWS
%{_mandir}/*/*
%{_bindir}/*
%{_datadir}/pkgconfig/usbutils.pc
%doc AUTHORS COPYING ChangeLog NEWS README
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Apr 19 2012 Lukas Nykryn <lnykryn@redhat.com> 004-4
- Ignore missing driver symlink (#808934)
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 004-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Aug 20 2011 Lukas Nykryn <lnykryn@redhat.com> 004-2
- fixed paths to usb.ids
* Sat Aug 13 2011 Jiri Moskovcak <jmoskovc@redhat.com> 004-1
- new upstream release
- dropepd config descriptor patch, it's included in upstream version
* Thu Aug 11 2011 Jiri Moskovcak <jmoskovc@redhat.com> 003-3
- fixed path to usb.ids in lsusb.py rhbz#729903
* Mon Jun 27 2011 Nils Philippsen <nils@redhat.com> 003-2
- don't use invalid config descriptors (#707853)
* Thu Jun 16 2011 Jiri Moskovcak <jmoskovc@redhat.com> 003-1
- new upstream release
* Tue Apr 26 2011 Jiri Moskovcak <jmoskovc@redhat.com> 002-1
- new upstream release
- udpated hwdata patch
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 001-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Jan 27 2011 Jiri Moskovcak <jmoskovc@redhat.com> 001-2
- rebuild against new libusb
* Thu Jan 06 2011 Jiri Moskovcak <jmoskovc@redhat.com> 001-1
- new upstream release
- updated usbhid-dump subproject
- usbutils: Support UVC frame-based descriptors
- usbutils: Support UVC MPEG2-TS format descriptor
- lsusb: Fix getting BOS and DEVQUAL descriptors
- lsusb: Dump the Pipe Usage desciptor
- lsusb: Fix bMaxBurst reporting
- lsusb: install into /usr/bin
- usbmisc: pull in unistd.h for readlink()
- lsusb: pull in stdlib.h for exit()
- lsusb: constify!
- usbutils: convert to libusb-1.0
- Update usbhid-dump to release 1.2
- usbutils: Fix compile error on Ubuntu 9.04
- usbutils: Make lsusb -t show USB 3.0 devices
* Wed Oct 27 2010 Jiri Moskovcak <jmoskovc@redhat.com> 0.91-2
- bump release
* Wed Oct 27 2010 Jiri Moskovcak <jmoskovc@redhat.com> 0.91-1
- new upstream release
- ads usbhid-dump
* Thu Aug 26 2010 Jiri Moskovcak <jmoskovc@redhat.com> 0.90-1
- new upstream release
* Tue Sep 22 2009 Jiri Moskovcak <jmoskovc@redhat.com> 0.86-2
- spec file fixes - package should not own /usr/{bin,sbin} (rhbz#524005)
* Wed Sep 16 2009 Jiri Moskovcak <jmoskovc@redhat.com> 0.86-1
- new version
- spec file fixes as suggested in rhbz#466041 (info@owlriver.com)
* Mon Aug 24 2009 Karsten Hopp <karsten@redhat.com> 0.82-5
- drop ExcludeArch: s390 s390x as we need this package on s390x to be able to build
p.e. udev without any hacks
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.82-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Jul 1 2009 Jiri Moskovcak <jmoskovc@rdhat.com> 0.82-3
- added autoconf to fix build in koji
* Wed Jul 1 2009 Jiri Moskovcak <jmoskovc@redhat.com> 0.82-2
- minor fix in Makefile.am to properly find usb.ids from hwdata
- Resolves: #506974
* Fri May 22 2009 David Zeuthen <davidz@redhat.com> 0.82-1
- Update to 0.82
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.73-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Tue Feb 12 2008 Jiri Moskovcak <jmoskovc@redhat.com> 0.73-2
- spec file cleanup
* Thu Jan 17 2008 Jiri Moskovcak <jmoskovc@redhat.com> 0.73-1
- new version 0.73
* Mon Sep 18 2006 Thomas Woerner <twoerner@redhat.com> 0.72-1
- new version 0.72
- videoterminal (vt) patch is now upstream, dropped
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.71-2.1
- rebuild
* Wed Mar 01 2006 Karsten Hopp <karsten@redhat.de> 1.71-2
- add usbutils-0.71-VT.patch to fix warnings about unknown lines
(#176903)
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.71-1.2
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.71-1.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Tue Dec 13 2005 Thomas Woerner <twoerner@redhat.com> 0.71-1
- new version 0.71
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Fri Apr 15 2005 Thomas Woerner <twoerner@redhat.com> 0.70-1.1
- added fix from Robert Scheck to fix missing BuildRequires for libusb-devel
(#155006)
* Thu Apr 14 2005 Thomas Woerner <twoerner@redhat.com> 0.70-1
- new version 0.70
* Thu Jan 20 2005 David Woodhouse <dwmw2@redhat.com> 0.11-6.2
- Don't byteswap parts of device descriptor which kernel already swapped
* Mon Sep 13 2004 Thomas Woerner <twoerner@redhat.com> 0.11-6.1
- added missing BuildRequires for libtool (#132406)
* Wed Sep 1 2004 Thomas Woerner <twoerner@redhat.com> 0.11-6
- added patch from Aurelien Jarno for unknown HID Country Code entries in
usb.ids (#127415)
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Tue May 4 2004 Bill Nottingham <notting@redhat.com> 0.11-4
- add patch from USB maintainer to fix various brokenness (#115694, <david-b@pacbell.net>)
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Tue Jun 3 2003 Jeff Johnson <jbj@redhat.com>
- add explicit epoch's where needed.
* Mon May 19 2003 Bill Nottingham <notting@redhat.com> 0.11-1
- update to 0.11, fixes #90640
- add patch to fix some warnings (#78462, <d.binderman@virgin.net>)
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
* Fri Nov 29 2002 Tim Powers <timp@redhat.com> 0.9-9
- remove unpackaged files from the buildroot
* Wed Nov 20 2002 Florian La Roche <Florian.LaRoche@redhat.de>
- exclude mainframe
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Thu Mar 21 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.9-5
- Fix conflict check
* Mon Mar 18 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.9-4
- Conflict with older versions of hotplug which contained
parts of this package (#60615)
* Fri Feb 22 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.9-3
- Rebuild
* Wed Jan 30 2002 Bill Nottingham <notting@redhat.com> 0.9-2
- require hwdata
* Wed Jan 16 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.9-1
- Initial RPM
- make it build on ia64
%autochangelog