commit 69ce6ef53138ac77b8850938ced1e2b39dd160e4
Author: Jan Palus <[email protected]>
Date: Wed Oct 23 13:28:25 2024 +0200
up to 018
- upstream switched to meson
hwdata.patch | 42 +++++++++++++++---------------------------
usbutils.spec | 54 +++++++++++++-----------------------------------------
2 files changed, 28 insertions(+), 68 deletions(-)
---
diff --git a/usbutils.spec b/usbutils.spec
index b2ea2dc..0ff0f37 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -3,27 +3,27 @@ Summary: Linux USB utilities
Summary(pl.UTF-8): Linuksowe narzędzia do USB
Summary(pt_BR.UTF-8): Utilitários Linux USB
Name: usbutils
-Version: 017
+Version: 018
Release: 1
License: GPL v2+
Group: Applications/System
Source0:
https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
-# Source0-md5: 8ff21441faf2e8128e4810b3d6e49059
+# Source0-md5: 0a351e2241c50a1f026a455dccf24d73
Patch0: hwdata.patch
URL: http://www.linux-usb.org/
-BuildRequires: autoconf >= 2.61
-BuildRequires: automake >= 1:1.9
-BuildRequires: libtool
-BuildRequires: libusb-devel >= 1.0.14
+BuildRequires: libusb-devel >= 1.0.22
+BuildRequires: meson >= 0.60.0
+BuildRequires: ninja
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.507
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel >= 1:196
BuildRequires: xz
BuildRequires: zlib-devel
-Requires: libusb >= 1.0.14
+Requires: libusb >= 1.0.22
Requires: udev-core >= 1:196
+Obsoletes: usbutils-devel < 018
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -38,17 +38,6 @@ podłączonych do szyny USB.
Este pacote contém utilitários para inspecionar dispositivos
conectados a um barramento USB.
-%package devel
-Summary: Development files for usbutils
-Summary(pl.UTF-8): Pliki programistyczne usbutils
-Group: Development/Libraries
-
-%description devel
-Development files for usbutils.
-
-%description devel -l pl.UTF-8
-Pliki programistyczne usbutils.
-
%package python
Summary: Python based lsusb program
Summary(pl.UTF-8): Program lsusb napisany w Pythonie
@@ -65,29 +54,15 @@ Program lsusb napisany w Pythonie.
%setup -q
%patch0 -p1
-%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' lsusb.py.in
+%{__sed} -i -e '1s,.*python3,%{__python3},' lsusb.py
%build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd usbhid-dump
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd ..
-%configure \
- --disable-silent-rules
-%{__make}
+%meson build
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- INSTALL="install -p" \
- DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
%clean
rm -rf $RPM_BUILD_ROOT
@@ -102,10 +77,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/lsusb.8*
%{_mandir}/man8/usbhid-dump.8*
-%files devel
-%defattr(644,root,root,755)
-%{_pkgconfigdir}/usbutils.pc
-
%files python
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/lsusb.py
+%{_mandir}/man1/lsusb.py.1*
diff --git a/hwdata.patch b/hwdata.patch
index fb55ff3..ece5c75 100644
--- a/hwdata.patch
+++ b/hwdata.patch
@@ -1,33 +1,21 @@
---- usbutils-012/lsusb.py.in.orig 2019-06-01 22:20:08.590192363 +0200
-+++ usbutils-012/lsusb.py.in 2019-06-02 07:21:55.317421635 +0200
-@@ -463,7 +463,7 @@
+--- usbutils-018/lsusb.py.orig 2024-10-22 11:33:33.000000000 +0200
++++ usbutils-018/lsusb.py 2024-10-23 13:18:12.108103599 +0200
+@@ -27,8 +27,7 @@
+
+ prefix = "/sys/bus/usb/devices/"
+ usbids = [
+- "/usr/share/hwdata/usb.ids",
+- "/usr/share/usb.ids",
++ "/lib/hwdata/usb.ids",
+ ]
+ cols = ("", "", "", "", "", "")
+
+@@ -467,7 +466,7 @@
print(" -C, --no-color disable colors")
print(" -e, --endpoints display endpoint info")
print(" -f FILE, --usbids-path FILE")
-- print(" override filename for
/usr/share/usb.ids")
-+ print(" override filename for " + usbids)
+- print(" override filename for
/usr/share/{hwdata/,}usb.ids")
++ print(" override filename for " + ",
".join(usbids))
print(" -w, --wakeup display power wakeup setting")
print()
print("Use lsusb.py -ciu to get a nice overview of your USB devices.")
---- usbutils-010/Makefile.am.orig 2018-05-15 15:45:26.000000000 +0200
-+++ usbutils-010/Makefile.am 2018-05-20 15:33:58.907113099 +0200
-@@ -51,7 +51,7 @@
- pkgconfig_DATA = usbutils.pc
-
- lsusb.py: $(srcdir)/lsusb.py.in
-- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
-+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|/lib/hwdata/usb.ids|g' $< >$@
- chmod 755 $@
-
- lsusb.8: $(srcdir)/lsusb.8.in
---- usbutils-010/configure.ac.orig 2018-05-20 11:34:32.067277134 +0200
-+++ usbutils-010/configure.ac 2018-05-20 15:35:00.030445728 +0200
-@@ -35,7 +35,7 @@
- pkgconfigdir: ${pkgconfigdir}
- mandir: ${mandir}
-
-- usb.ids: ${datadir}/usb.ids
-+ usb.ids: /lib/hwdata/usb.ids
-
- compiler: ${CC}
- cflags: ${CFLAGS}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/usbutils.git/commitdiff/69ce6ef53138ac77b8850938ced1e2b39dd160e4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
