diff --git a/usbutils-0.86-hwdata.patch b/usbutils-0.86-hwdata.patch deleted file mode 100644 index a4638d4..0000000 --- a/usbutils-0.86-hwdata.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nru usbutils-0.86.orig/Makefile.am usbutils-0.86/Makefile.am ---- usbutils-0.86.orig/Makefile.am 2009-08-18 00:23:35.000000000 +0200 -+++ usbutils-0.86/Makefile.am 2011-10-31 18:26:36.444897471 +0100 -@@ -1,18 +1,9 @@ - AM_LDFLAGS = \ - -Wl,--as-needed - --data_DATA = \ -- usb.ids --if HAVE_ZLIB --data_DATA += usb.ids.gz --endif -- - sbin_PROGRAMS = \ - lsusb - --sbin_SCRIPTS = \ -- update-usbids.sh -- - bin_SCRIPTS = \ - usb-devices - -@@ -26,7 +17,7 @@ - - lsusb_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -- -DDATADIR=\"$(datadir)\" -+ -DDATADIR=\"$(datadir)/hwdata\" - - lsusb_LDADD = \ - $(LIBUSB_LIBS) -@@ -36,22 +27,13 @@ - usb-devices.1 - - EXTRA_DIST = \ -- usb.ids \ -- update-usbids.sh.in \ - lsusb.8.in \ - usb-devices.1.in \ - usb-devices \ - 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' $< >$@ -+ 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' $< >$@ -@@ -60,13 +42,11 @@ - 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 = \ -- usb.ids.gz \ - lsusb.8 \ - usb-devices.1 \ -- update-usbids.sh \ - usbutils.pc - - distclean-local: diff --git a/usbutils.spec b/usbutils.spec index 8ff423b..25e5cd4 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,6 +1,6 @@ %define gittag %(echo %version | cut -d. -f3) Name: usbutils -Version: 017 +Version: 018 Release: 1mamba Summary: Utilities for handling USB devices Group: System/Kernel and Hardware @@ -8,8 +8,7 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/gregkh/usbutils -Source: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/master@%{gittag}/usbutils-%{version}.tar.bz2 -Patch0: %{name}-0.86-hwdata.patch +Source: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/v%{version}/usbutils-%{version}.tar.bz2 License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -28,27 +27,18 @@ The "usbutils" package is most useful for the "lsusb" utility, which can provide %prep %setup -q -#%patch0 -p1 -./autogen.sh %build -%configure \ - --datadir=%{_datadir}/hwdata +%meson -# --disable-zlib \ -# --disable-usbids \ - -%make - -## do update `usb.ids' from -#./update-usbids.sh +%meson_build %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%makeinstall - -#ln -s ../sbin/lsusb %{buildroot}%{_bindir}/lsusb +%meson_install +install -D -m0755 build/usbreset -t %{buildroot}%{_bindir} + %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -58,13 +48,17 @@ The "usbutils" package is most useful for the "lsusb" utility, which can provide %{_bindir}/lsusb.py %{_bindir}/usbhid-dump %{_bindir}/usb-devices +%{_bindir}/usbreset %{_mandir}/man1/usb-devices.1* +%{_mandir}/man1/lsusb.py.1* %{_mandir}/man8/* -%{_libdir}/pkgconfig/usbutils.pc %doc LICENSES #%doc NEWS README ChangeLog %changelog +* Mon Nov 11 2024 Silvan Calarco 018-1mamba +- update to 018 + * Tue Oct 31 2023 Automatic Build System 017-1mamba - automatic version update by autodist @@ -136,5 +130,5 @@ The "usbutils" package is most useful for the "lsusb" utility, which can provide - removed devel package (usbutils uses now the system library libusb to access USB devices, not a private (old) copy of that library.) -* Mon Jul 02 2003 Silvan Calarco 0.11-1qilnx +* Wed Jul 02 2003 Silvan Calarco 0.11-1qilnx - first build of USB-utils