From mboxrd@z Thu Jan 1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] usbutils: Update to 014
Date: Mon, 28 Nov 2022 17:58:24 +0100
Message-ID: <64956b2d-05e6-ce4d-d2e4-2f967922d224@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3121347477217938096=="
List-Id: <development.lists.ipfire.org>
--===============3121347477217938096==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
usbutils/patches/usbutils-003-hwdata.patch | 79 ---------------------
usbutils/patches/usbutils-make-hwdata.patch | 21 ------
usbutils/usbutils.nm | 11 ++-
3 files changed, 4 insertions(+), 107 deletions(-)
delete mode 100644 usbutils/patches/usbutils-003-hwdata.patch
delete mode 100644 usbutils/patches/usbutils-make-hwdata.patch
diff --git a/usbutils/patches/usbutils-003-hwdata.patch b/usbutils/patches/us=
butils-003-hwdata.patch
deleted file mode 100644
index 4a08c48fa..000000000
--- a/usbutils/patches/usbutils-003-hwdata.patch
+++ /dev/null
@@ -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 =3D \
- -Wl,--as-needed
-
--data_DATA =3D \
-- usb.ids
--
- bin_PROGRAMS =3D \
- lsusb
-
--sbin_SCRIPTS =3D \
-- update-usbids.sh
--
- bin_SCRIPTS =3D \
- usb-devices \
- lsusb.py
-@@ -27,37 +21,22 @@
-
- lsusb_CPPFLAGS =3D \
- $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
-- -DDATADIR=3D\"$(datadir)\"
-+ -DDATADIR=3D\"$(datadir)/hwdata\"
-
- lsusb_LDADD =3D \
- $(LIBUSB_LIBS)
-
--if HAVE_ZLIB
--data_DATA +=3D usb.ids.gz
--lsusb_CPPFLAGS +=3D -DHAVE_LIBZ
--lsusb_LDADD +=3D -lz
--endif
--
- man_MANS =3D \
- lsusb.8 \
- usb-devices.1
-
- EXTRA_DIST =3D \
-- 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 =3D \
-- 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 =3D False
-
- prefix =3D "/sys/bus/usb/devices/"
--usbids =3D "/usr/share/usb.ids"
-+usbids =3D "/usr/share/hwdata/usb.ids"
-
- esc =3D chr(27)
- norm =3D esc + "[0;0m"
diff --git a/usbutils/patches/usbutils-make-hwdata.patch b/usbutils/patches/u=
sbutils-make-hwdata.patch
deleted file mode 100644
index 862c7fcb3..000000000
--- a/usbutils/patches/usbutils-make-hwdata.patch
+++ /dev/null
@@ -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 =3D \
- 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 =3D $(datarootdir)/pkgconfig
- pkgconfig_DATA =3D 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 =3D \
- lsusb.8 \
diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm
index a54a78c0d..a0038fef5 100644
--- a/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@ -5,11 +5,11 @@
=20
name =3D usbutils
epoch =3D 1
-version =3D 005
+version =3D 014
release =3D 4
=20
groups =3D System/Tools
-url =3D http://www.linux-usb.org/
+url =3D https://www.linux-usb.org/
license =3D GPLv2
summary =3D Tool to provide and enhance USB support in Linux.
=20
@@ -17,21 +17,18 @@ description
A set of tools to configure list USB Devices.
end
=20
-source_dl =3D http://www.kernel.org/pub/linux/utils/usb/usbutils/
+source_dl =3D https://www.kernel.org/pub/linux/utils/usb/usbutils/
=20
build
requires
autoconf
automake
hwdata
+ libudev-devel
libusb-devel
zlib-devel
end
=20
- prepare_cmds
- ./autogen.sh
- end
-
install_cmds
# Removing lsusb.py.
rm -rfv %{BUILDROOT}/usr/bin/lsusb.py
--=20
2.34.1
--===============3121347477217938096==--