Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

polkit/pkexec are no longer used as of 3.1:

8f911eb044

Also, the GdkPixbuf loader for XPM is now in a separate package as of
Fedora 41 and RHEL/EPEL 10.

.gitignore

@@ -1,2 +1 @@
-usbview-1.1.tar.gz
-/usbview-2.0.tar.gz
+/usbview-*.tar.gz

org.fedoraproject.usbview.policy

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
-"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
- <vendor>System Config Date</vendor>
- <vendor_url>http://fedoraproject.org/</vendor_url>
-
- <action id="org.fedoraproject.usbview.pkexec.run">
-    <description>Run USB topology and device viewer</description>
-    <message>Authentication is required to run usbview</message>
-    <message xml:lang="cs">Pro spuštění usbview je vyžadována autentizace</message>
-    <message xml:lang="da">Godkendelse er påkrævet for at køre usbview</message>
-    <message xml:lang="de">Man muss dazu berechtigt sein, usbview auszuführen</message>
-    <message xml:lang="es">Se necesita autenticación para poder ejecutar usbview</message>
-    <message xml:lang="fr">Une authentification est demandée pour exécuter usbview</message>
-    <message xml:lang="hu">Azonosítás szükséges a usbview futtatásához</message>
-    <message xml:lang="ia">Authentication es necessari pro exequer usbview</message>
-    <message xml:lang="ja">usbview を実行するには、認証が必要です</message>
-    <message xml:lang="nb">Autentisering kreves for å kjøre usbview</message>
-    <message xml:lang="nl">Voor het draaien van usbview is authenticatie vereist</message>
-    <message xml:lang="pl">Wymagane jest uwierzytelnienie, aby uruchomić System-Config-Date</message>
-    <message xml:lang="tr">usbview uygulamasını çalıştırmak için yetki gerekiyor</message>
-    <message xml:lang="uk">Щоб мати змогу працювати з usbview, вам слід пройти розпізнавання</message>
-    <message xml:lang="zh_CN">运行 usbview 需要认证</message>
-    <message xml:lang="zh_TW">執行 usbview 需要先通過驗證</message>
-    <icon_name>usbview</icon_name>
-    <defaults>
-     <allow_any>no</allow_any>
-     <allow_inactive>no</allow_inactive>
-     <allow_active>auth_admin</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/usbview.bin</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
- </action>
-</policyconfig>

sources

@@ -1 +1 @@
-565f2e79f3924d14ab5b4d8aced557e5  usbview-2.0.tar.gz
+SHA512 (usbview-3.1.tar.gz) = edc60d9543e5ebb377d4d1e71b8ca83d055cee9c12270a4d189a19503c12c8574103637fd6b9a13741c6dc9375a80c7c57daf4d6ccf0520d55e843e07be09479

usbview.desktop

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

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 <releng@fedoraproject.org> - 3.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Dec 24 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 3.1-4
+- Update dependencies
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Oct 24 2023 Vojtech Trefny <vtrefny@redhat.com> - 3.1-1
+- New upstream release 3.1
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 FeRD (Frank Dana> <ferdnyc@gmail.com> - 3.0-1
+- New upstream release
+
+* Sat Jan 22 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 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 <releng@fedoraproject.org> - 2.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild