diff --git a/.gitignore b/.gitignore index 4e73b37..564b1cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -usbview-1.1.tar.gz +/usbview-*.tar.gz diff --git a/sources b/sources index 96f571e..9dd2bc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bf5e66351156356f3ad07454123affa usbview-1.1.tar.gz +SHA512 (usbview-3.1.tar.gz) = edc60d9543e5ebb377d4d1e71b8ca83d055cee9c12270a4d189a19503c12c8574103637fd6b9a13741c6dc9375a80c7c57daf4d6ccf0520d55e843e07be09479 diff --git a/usbview.desktop b/usbview.desktop deleted file mode 100644 index 6f455e2..0000000 --- a/usbview.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=USB Viewer -GenericName=USB Viewer -Comment=USB topology and device viewer -Exec=usbview -Icon=usbview_icon -Terminal=false -Type=Application -Categories=System; diff --git a/usbview.spec b/usbview.spec index 1107c0b..4ce8f6d 100644 --- a/usbview.spec +++ b/usbview.spec @@ -1,69 +1,176 @@ Name: usbview -Version: 1.1 -Release: 4%{?dist} +Version: 3.1 +Release: 8%{?dist} Summary: USB topology and device viewer - -Group: Applications/System -License: GPLv2 +License: GPL-2.0-only URL: http://www.kroah.com/linux-usb/ Source0: http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gtk2-devel - -Source1: %{name}_icon.png -Source2: %{name}.desktop - BuildRequires: desktop-file-utils - +BuildRequires: gcc +BuildRequires: gtk3-devel +BuildRequires: ImageMagick +BuildRequires: make +BuildRequires: libappstream-glib +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10 +Requires: gdk-pixbuf2-modules-extra +%endif +Requires: hicolor-icon-theme %description Display information about the topology of the devices connected to the USB bus on a Linux machine. It also displays detailed information on the individual devices. + %prep -%setup -q -# Convert to utf-8 -for file in ChangeLog; do - iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ - touch -r $file $file.new && \ - mv $file.new $file -done +%autosetup -p1 %build %configure -make %{?_smp_mflags} - +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -#install desktop icon -install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_icon.png - -#install desktop file -desktop-file-install \ ---vendor fedora \ ---add-category="System" \ ---dir=$RPM_BUILD_ROOT%{_datadir}/applications \ -%{SOURCE2} - -%clean -rm -rf $RPM_BUILD_ROOT +%make_install +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usbview.metainfo.xml %files -%defattr(-,root,root,-) -%doc ChangeLog COPYING* README TODO -%{_bindir}/usbview +%license LICENSES/GPL-2.0-only.txt +%{_bindir}/usbview* %{_mandir}/man8/usbview* -%{_datadir}/pixmaps/%{name}_icon.png -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/applications/*%{name}.desktop +%{_metainfodir}/com.kroah.usbview.metainfo.xml + %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Dec 24 2024 Yaakov Selkowitz - 3.1-4 +- Update dependencies + +* Sat Jul 20 2024 Fedora Release Engineering - 3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Oct 24 2023 Vojtech Trefny - 3.1-1 +- New upstream release 3.1 + +* Sat Jul 22 2023 Fedora Release Engineering - 3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 FeRD (Frank Dana> - 3.0-1 +- New upstream release + +* Sat Jan 22 2022 Peter Robinson - 2.2-1 +- Update to 2.2 (fixes (CVE-2022-23220) +- Move to upstream desktop/polkit policy +- Use %%license +- Cleanup spec + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 2.0-11 +- Remove obsolete scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri May 10 2013 Hans de Goede - 2.0-2 +- Remove no longer needed autoreconf call, %%configure from redhat-rpm-config + >= 9.1.0-42 updates config.guess and config.sub for new architecture support + +* Sat Apr 6 2013 Hans de Goede - 2.0-1 +- New upstream release 2.0 +- Drop patches (all upstreamed) +- Fix usbview not working with newer kernels due to debugfs permission changes + by using pxexec. Ideally usbview would be rewritten to use the public parts + of sysfs instead. + +* Sat Feb 09 2013 Parag Nemade - 1.1-10 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 14 2012 Hans de Goede - 1.1-8 +- Fix usbview not working due to missing usbfs (rhbz#806595) +- Port to gtk3 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 1.1-6 +- Rebuild for new libpng + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Dec 15 2009 Itamar Reis Peixoto - 1.1-4 - include --vendor fedora in desktop-file-install (required for EL-5) diff --git a/usbview_icon.png b/usbview_icon.png deleted file mode 100644 index 85d1b81..0000000 Binary files a/usbview_icon.png and /dev/null differ