diff --git a/.gitignore b/.gitignore index 230d91a..564b1cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -usbview-1.1.tar.gz -/usbview-2.0.tar.gz +/usbview-*.tar.gz diff --git a/org.fedoraproject.usbview.policy b/org.fedoraproject.usbview.policy deleted file mode 100644 index a40d9f0..0000000 --- a/org.fedoraproject.usbview.policy +++ /dev/null @@ -1,37 +0,0 @@ - - - - - System Config Date - http://fedoraproject.org/ - - - Run USB topology and device viewer - Authentication is required to run usbview - Pro spuštění usbview je vyžadována autentizace - Godkendelse er påkrævet for at køre usbview - Man muss dazu berechtigt sein, usbview auszuführen - Se necesita autenticación para poder ejecutar usbview - Une authentification est demandée pour exécuter usbview - Azonosítás szükséges a usbview futtatásához - Authentication es necessari pro exequer usbview - usbview を実行するには、認証が必要です - Autentisering kreves for å kjøre usbview - Voor het draaien van usbview is authenticatie vereist - Wymagane jest uwierzytelnienie, aby uruchomić System-Config-Date - usbview uygulamasını çalıştırmak için yetki gerekiyor - Щоб мати змогу працювати з usbview, вам слід пройти розпізнавання - 运行 usbview 需要认证 - 執行 usbview 需要先通過驗證 - usbview - - no - no - auth_admin - - /usr/bin/usbview.bin - true - - diff --git a/sources b/sources index a0e6311..9dd2bc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -565f2e79f3924d14ab5b4d8aced557e5 usbview-2.0.tar.gz +SHA512 (usbview-3.1.tar.gz) = edc60d9543e5ebb377d4d1e71b8ca83d055cee9c12270a4d189a19503c12c8574103637fd6b9a13741c6dc9375a80c7c57daf4d6ccf0520d55e843e07be09479 diff --git a/usbview.desktop b/usbview.desktop deleted file mode 100644 index 1797832..0000000 --- a/usbview.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=USB Viewer -Comment=USB topology and device viewer -Exec=usbview -Icon=usbview -Terminal=false -Type=Application -Categories=System; diff --git a/usbview.spec b/usbview.spec index 90bab01..4ce8f6d 100644 --- a/usbview.spec +++ b/usbview.spec @@ -1,15 +1,21 @@ Name: usbview -Version: 2.0 -Release: 14%{?dist} +Version: 3.1 +Release: 8%{?dist} Summary: USB topology and device viewer -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 -Source1: %{name}.desktop -Source2: org.fedoraproject.usbview.policy + +BuildRequires: desktop-file-utils BuildRequires: gcc -BuildRequires: gtk3-devel desktop-file-utils -Requires: hicolor-icon-theme polkit +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 @@ -18,55 +24,87 @@ 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 %make_install -#setup pkxexec -mv $RPM_BUILD_ROOT%{_bindir}/usbview $RPM_BUILD_ROOT%{_bindir}/usbview.bin -cat > $RPM_BUILD_ROOT%{_bindir}/usbview << EOF -#!/bin/sh -exec pkexec %{_bindir}/usbview.bin -EOF -chmod +x $RPM_BUILD_ROOT%{_bindir}/usbview -mkdir -p $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions -install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions - -#install desktop icon -install -Dp -m 0644 usb_icon.xpm \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.xpm - -#install desktop file -desktop-file-install \ -%if 0%{?fedora} && 0%{?fedora} < 19 ---vendor fedora \ -%endif ---dir=$RPM_BUILD_ROOT%{_datadir}/applications \ -%{SOURCE1} +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usbview.metainfo.xml %files -%doc ChangeLog COPYING* README TODO +%license LICENSES/GPL-2.0-only.txt %{_bindir}/usbview* %{_mandir}/man8/usbview* -%{_datadir}/polkit-1/actions/org.fedoraproject.usbview.policy -%{_datadir}/icons/hicolor/64x64/apps/%{name}.xpm +%{_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