Compare commits

...

8 Commits

2 changed files with 44 additions and 93 deletions

View File

@ -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:

View File

@ -1,50 +1,43 @@
%define gittag %(echo %version | cut -d. -f3)
Name: usbutils
Version: 009
Version: 018
Release: 1mamba
Summary: Utilities for handling USB devices
Group: System/Kernel and Hardware
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://usb.cs.tum.edu/
Source: https://mirrors.edge.kernel.org/pub/linux/utils/usb/usbutils/usbutils-%{version}.tar.xz
#Source: http://downloads.sourceforge.net/sourceforge/linux-usb/%{name}-%{version}.tar.gz
Patch0: %{name}-0.86-hwdata.patch
URL: https://github.com/gregkh/usbutils
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
BuildRequires: libudev-devel
BuildRequires: libusb-devel
## AUTOBUILDREQ-END
Provides: usbutils-devel = %{version}
Obsoletes: usbutils-devel
Obsoletes: usbutils-devel < 014
Requires: hwdata
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
%description
The "usbutils" package is most useful for the "lsusb" utility, which can provide considerable detail about the USB devices connected to your Linux system.
(It's like "pciutils" is for PCI.)
%debug_package
%prep
%setup -q
#%patch0 -p1
%build
autoreconf -i
%configure \
--disable-zlib \
--disable-usbids \
--datadir=%{_datadir}/hwdata
%meson
%make
## do update `usb.ids' from <http://www.linux-usb.org></http:>
#./update-usbids.sh
%meson_build
%install
[ "%{buildroot}" != / ] && rm -rf %{buildroot}
%makeinstall
%meson_install
#ln -s ../sbin/lsusb %{buildroot}%{_bindir}/lsusb
install -D -m0755 build/usbreset -t %{buildroot}%{_bindir}
%clean
[ "%{buildroot}" != / ] && rm -rf %{buildroot}
@ -55,13 +48,41 @@ autoreconf -i
%{_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 AUTHORS COPYING
%doc LICENSES
#%doc NEWS README ChangeLog
%changelog
* Mon Nov 11 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 018-1mamba
- update to 018
* Tue Oct 31 2023 Automatic Build System <autodist@mambasoft.it> 017-1mamba
- automatic version update by autodist
* Wed Oct 25 2023 Automatic Build System <autodist@mambasoft.it> 016-1mamba
- automatic version update by autodist
* Sat Nov 26 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 015.20221022git.79b796f9-1mamba
- update to 015.20221022git.79b796f9
* Sat Nov 26 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 015.20221022git.-1mamba
- update to 015.20221022git.
* Sat Aug 28 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 014-1mamba
- update to 014
* Sat Oct 31 2020 Automatic Build System <autodist@mambasoft.it> 013-1mamba
- automatic update by autodist
* Wed Sep 11 2019 Automatic Build System <autodist@mambasoft.it> 012-1mamba
- automatic version update by autodist
* Fri Aug 17 2018 Automatic Build System <autodist@mambasoft.it> 010-1mamba
- automatic version update by autodist
* Wed Mar 21 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 009-1mamba
- update to 009
@ -109,5 +130,5 @@ autoreconf -i
- 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 <silvan.calarco@qinet.it> 0.11-1qilnx
* Wed Jul 02 2003 Silvan Calarco <silvan.calarco@qinet.it> 0.11-1qilnx
- first build of USB-utils