From 22f533f8d5ad5f370b80d113d184f2bca35cb3c6 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 7 Feb 2011 18:42:55 -0600
Subject: [PATCH 01/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 1107c0b..f4db432 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        USB topology and device viewer
 
 Group:          Applications/System
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Tue Dec 15 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 1.1-4
 - include --vendor fedora in desktop-file-install (required for EL-5)
 

From b4750bff3e55568c65f7a33010cd7281998a5297 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 6 Dec 2011 01:23:58 -0500
Subject: [PATCH 02/45] Rebuild for new libpng

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index f4db432..4cdf31c 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        USB topology and device viewer
 
 Group:          Applications/System
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.1-6
+- Rebuild for new libpng
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 859879116535f0629d2e32c4d695c9b6ad1ff6c4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 14 Jan 2012 01:40:17 -0600
Subject: [PATCH 03/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 4cdf31c..5344afd 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        USB topology and device viewer
 
 Group:          Applications/System
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.1-6
 - Rebuild for new libpng
 

From 712737f16e0b7b1a03d97838d0060792b9e3f1a6 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 14 Jun 2012 23:40:18 +0200
Subject: [PATCH 04/45] Fix usbview not working due to missing usbfs
 (rhbz#806595)

- Port to gtk3
---
 usbview-1.1-gtk3-port.patch          | 802 +++++++++++++++++++++++++++
 usbview-1.1-no-more-procbususb.patch |  24 +
 usbview.desktop                      |   2 +-
 usbview.spec                         |  51 +-
 usbview_icon.png                     | Bin 1425 -> 0 bytes
 5 files changed, 859 insertions(+), 20 deletions(-)
 create mode 100644 usbview-1.1-gtk3-port.patch
 create mode 100644 usbview-1.1-no-more-procbususb.patch
 delete mode 100644 usbview_icon.png

diff --git a/usbview-1.1-gtk3-port.patch b/usbview-1.1-gtk3-port.patch
new file mode 100644
index 0000000..41c306c
--- /dev/null
+++ b/usbview-1.1-gtk3-port.patch
@@ -0,0 +1,802 @@
+--- usbview-1.1/Makefile.am	2009-03-11 03:25:46.000000000 +0100
++++ usbview-1.1.new/Makefile.am	2012-06-14 20:33:10.641639573 +0200
+@@ -16,10 +16,8 @@
+ 	interface.c		\
+ 	callbacks.c		\
+ 	usbtree.c usbtree.h	\
+-	showmessage.c		\
+ 	usbparse.c usbparse.h	\
+ 	configure-dialog.c      \
+-	about-dialog.c		\
+ 	usbview_logo.xpm	\
+ 	usbview_logo.xcf	\
+ 	usb_icon.xpm		\
+--- usbview-1.1/callbacks.c	2008-06-25 23:03:13.000000000 +0200
++++ usbview-1.1.new/callbacks.c	2012-06-14 21:06:05.000523489 +0200
+@@ -23,13 +23,13 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
+-
+ #include "usbtree.h"
++#include "usbview_logo.xpm"	/* logo */
+ 
+ 
+ void on_buttonClose_clicked (GtkButton *button, gpointer user_data)
+ {
+-	gtk_exit(0);
++	gtk_main_quit();
+ }
+ 
+ 
+@@ -55,7 +55,21 @@
+ 
+ void on_buttonAbout_clicked (GtkButton *button, gpointer user_data)
+ {
+-	about_dialog ();
++	GdkPixbuf *logo;
++	gchar *authors[] = { "Greg Kroah-Hartman <greg@kroah.com>", NULL };
++
++	logo = gdk_pixbuf_new_from_xpm_data ((const char **)usbview_logo_xpm);
++	gtk_show_about_dialog (GTK_WINDOW (windowMain),
++		"logo", logo,
++		"program-name", "usbview",
++		"version", VERSION,
++		"comments", "Display information on USB devices",
++		"website-label", "http://www.kroah.com/linux-usb/",
++		"website", "http://www.kroah.com/linux-usb/",
++		"copyright", "Copyright © 1999-2012",
++		"authors", authors,
++		NULL);
++	g_object_unref (logo);
+ }
+ 
+ 
+--- usbview-1.1/configure-dialog.c	2009-03-11 02:40:28.000000000 +0100
++++ usbview-1.1.new/configure-dialog.c	2012-06-14 21:06:05.000523489 +0200
+@@ -24,264 +24,78 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+ #include <string.h>
+-#include <ctype.h>
+-
+ #include "usbtree.h"
+ #include "usbparse.h"
+ 
+-
+-
+-
+ static	GtkWidget	*fileEntry;
+-static	GtkWidget	*filew;
+-static	char		*sFilename;
+-
+-/* 
+- * Get the selected filename and print it to the console 
+- */
+-static void file_ok_sel (GtkWidget *w, GtkFileSelection *fs)
+-{
+-	const char *sTempFile;
+-
+-	/* --- Get the name --- */
+-	sTempFile = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));
+-
+-	/* --- Allocate space and save it. --- */
+-	sFilename = malloc (sizeof (char) * (strlen (sTempFile) + 1));
+-	strcpy (sFilename, sTempFile);
+-
+-	/* --- Destroy the file selection --- */
+-	gtk_widget_destroy (filew);
+-}
+-
+-
+-static void file_cancel_sel (GtkWidget *w, GtkFileSelection *fs)
+-{
+-	/* --- Destroy the file selection --- */
+-	gtk_widget_destroy (filew);
+-}
+-
+-
+-/*
+- * DestroyDialog
+- *
+- * Destroy the dialog (obvious, eh?) but also remove the
+- * grab and close the modal. 
+- */
+-static int DestroyDialog (GtkWidget *widget, gpointer *data)
+-{
+-	gtk_grab_remove (widget);
+-	gtk_main_quit ();
+-	return(FALSE);
+-}
+-
+-
+-/*
+- * GetFilename 
+- */
+-static char *GetFilename (char *sTitle, char *initialFilename)
+-{
+-	sFilename = NULL;
+-
+-	/* --- Create a new file selection widget --- */
+-	filew = gtk_file_selection_new (sTitle);
+-
+-	/* --- If it's destroyed --- */
+-	gtk_signal_connect (GTK_OBJECT (filew), "destroy", (GtkSignalFunc) DestroyDialog, &filew);
+-
+-	/* --- Connect the ok_button to file_ok_sel function  --- */
+-	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->ok_button), "clicked", (GtkSignalFunc) file_ok_sel, filew );
+-
+-	/* --- Connect the cancel_button to destroy the widget  --- */
+-	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->cancel_button), "clicked", (GtkSignalFunc) file_cancel_sel, filew);
+-
+-	/* --- Lets set the filename --- */
+-	gtk_file_selection_set_filename (GTK_FILE_SELECTION(filew), initialFilename);
+-
+-	/* --- Turn off the file operation buttons --- */
+-	gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION(filew));
+-
+-	/* --- Of course, we show it --- */
+-	gtk_widget_show (filew);
+-
+-	/* --- Make sure we keep the focus --- */
+-	gtk_grab_add (filew);
+-
+-	gtk_main ();
+-
+-	return(sFilename);
+-}
+-
+-
+-static void ClearShowMessage (GtkWidget *widget, gpointer data)
+-{
+-	gtk_grab_remove (widget);
+-}
+-
+-static void CancelConfigureDialog (GtkWidget *widget, gpointer data)
+-{
+-	GtkWidget *dialogWidget = (GtkWidget *) data;
+-
+-	gtk_grab_remove (dialogWidget);
+-
+-	/* --- Close the widget --- */
+-	gtk_widget_destroy (dialogWidget);
+-}
+-
+-static void OkConfigureDialog (GtkWidget *widget, gpointer data)
+-{
+-	GtkWidget       *dialogWidget = (GtkWidget *) data;
+-	gchar           *editString;
+-
+-	editString = gtk_editable_get_chars (GTK_EDITABLE (fileEntry), 0, -1);
+-
+-	gtk_grab_remove (dialogWidget);
+-
+-	/* --- Close the widget --- */
+-	gtk_widget_destroy (dialogWidget);
+-
+-	strcpy (devicesFile, editString);
+-	g_free (editString);
+-	LoadUSBTree(0);
+-}
+-
+ 
+ static void fileSelectButtonClick (GtkWidget *widget, gpointer data)
+ {
+-	gchar   *newFilename;
++	GtkWidget *dialog;
++	gchar *filename;
+ 
+-	newFilename = GetFilename ("locate usbdevfs devices file", devicesFile);
+-
+-	if (newFilename != NULL) {
+-		gtk_entry_set_text (GTK_ENTRY (fileEntry), newFilename);
+-		gtk_widget_show (fileEntry);
+-		g_free (newFilename);
++	dialog = gtk_file_chooser_dialog_new (
++				"locate usbdevfs devices file",
++				GTK_WINDOW (windowMain),
++				GTK_FILE_CHOOSER_ACTION_OPEN,
++				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
++				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
++				NULL);
++
++	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
++	{
++		filename = gtk_file_chooser_get_filename(
++						GTK_FILE_CHOOSER (dialog));
++		gtk_entry_set_text (GTK_ENTRY (fileEntry), filename);
++		g_free (filename);
+ 	}
++			  
++	gtk_widget_destroy (dialog);
+ }
+ 
+-
+ void configure_dialog (void)
+ {
+-	GtkWidget *configDialog;
+-	GtkWidget *dialog_vbox2;
++	GtkWidget *dialog, *content_area;
+ 	GtkWidget *hbox1;
+ 	GtkWidget *label1;
+-	GtkWidget *label41;
+-	GtkWidget *label42;
+-	GtkWidget *label43;
+-	GtkWidget *vbox1;
+-	GtkWidget *dialog_action_area2;
+-	GtkWidget *hbuttonbox2;
+-	GtkWidget *okButton;
+-	GtkWidget *cancelButton;
+ 	GtkWidget *fileSelectButton;
++	gchar *editString;
++	gint result;
+ 
+-	configDialog = gtk_dialog_new ();
+-	gtk_object_set_data (GTK_OBJECT (configDialog), "configDialog", configDialog);
+-	gtk_window_set_title (GTK_WINDOW (configDialog), "USB View Configuration");
+-	gtk_window_set_policy (GTK_WINDOW (configDialog), TRUE, TRUE, FALSE);
+-
+-	dialog_vbox2 = GTK_DIALOG (configDialog)->vbox;
+-	gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_vbox2", dialog_vbox2);
+-	gtk_widget_show (dialog_vbox2);
+-
+-	vbox1 = gtk_vbox_new (FALSE, 0);
+-	gtk_widget_ref (vbox1);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (vbox1);
+-	gtk_box_pack_start (GTK_BOX (dialog_vbox2), vbox1, TRUE, TRUE, 0);
+-
+-	label41 = gtk_label_new ("");
+-	gtk_widget_ref (label41);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label41", label41, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (label41);
+-	gtk_box_pack_start (GTK_BOX (vbox1), label41, FALSE, FALSE, 0);
+-
+-	hbox1 = gtk_hbox_new (FALSE, 0);
+-	gtk_widget_ref (hbox1);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbox1", hbox1, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (hbox1);
+-//	gtk_box_pack_start (GTK_BOX (dialog_vbox2), hbox1, TRUE, TRUE, 0);
+-	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0);
+-
+-	label42 = gtk_label_new ("");
+-	gtk_widget_ref (label42);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label42", label42, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (label42);
+-	gtk_box_pack_start (GTK_BOX (vbox1), label42, FALSE, FALSE, 0);
+-
+-
+-	label1 = gtk_label_new ("  Location of usbdevfs devices file");
+-	gtk_widget_ref (label1);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label1", label1, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (label1);
++	dialog = gtk_dialog_new_with_buttons (
++				"USB View Configuration",
++				GTK_WINDOW (windowMain),
++				GTK_DIALOG_DESTROY_WITH_PARENT,
++				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
++				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
++				NULL);
++
++	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
++
++	hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++	gtk_container_add (GTK_CONTAINER (content_area), hbox1);
++
++	label1 = gtk_label_new ("Location of usbdevfs devices file");
+ 	gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5);
+ 
+ 	fileEntry = gtk_entry_new ();
+-	gtk_widget_ref (fileEntry);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileEntry", fileEntry, (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_entry_set_text (GTK_ENTRY (fileEntry), devicesFile);
+-	gtk_widget_show (fileEntry);
+ 	gtk_box_pack_start (GTK_BOX (hbox1), fileEntry, TRUE, TRUE, 0);
+ 
+-	dialog_action_area2 = GTK_DIALOG (configDialog)->action_area;
+-	gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_action_area2", dialog_action_area2);
+-	gtk_widget_show (dialog_action_area2);
+-	gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area2), 1);
+-
+-	hbuttonbox2 = gtk_hbutton_box_new ();
+-	gtk_widget_ref (hbuttonbox2);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbuttonbox2", hbuttonbox2, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (hbuttonbox2);
+-	gtk_box_pack_start (GTK_BOX (dialog_action_area2), hbuttonbox2, TRUE, TRUE, 11);
+-
+-	okButton = gtk_button_new_with_label ("  OK  ");
+-	gtk_widget_ref (okButton);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "okButton", okButton, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (okButton);
+-	gtk_container_add (GTK_CONTAINER (hbuttonbox2), okButton);
+-	GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
+-
+-	cancelButton = gtk_button_new_with_label ("  Cancel  ");
+-	gtk_widget_ref (cancelButton);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "cancelButton", cancelButton, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (cancelButton);
+-	gtk_container_add (GTK_CONTAINER (hbuttonbox2), cancelButton);
+-	GTK_WIDGET_SET_FLAGS (cancelButton, GTK_CAN_DEFAULT);
+-
+ 	fileSelectButton = gtk_button_new_with_label ("...");
+-	gtk_widget_ref (fileSelectButton);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileSelectButton", fileSelectButton, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (fileSelectButton);
+-
++	g_signal_connect (G_OBJECT (fileSelectButton), "clicked",
++			  G_CALLBACK (fileSelectButtonClick), NULL);
+ 	gtk_box_pack_start (GTK_BOX (hbox1), fileSelectButton, TRUE, FALSE, 1);
+ 
+-	label43 = gtk_label_new ("    ");
+-	gtk_widget_ref (label43);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label43", label43, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (label43);
+-	gtk_box_pack_start (GTK_BOX (hbox1), label43, FALSE, FALSE, 0);
+-	
+-	gtk_signal_connect (GTK_OBJECT (okButton), "clicked", GTK_SIGNAL_FUNC (OkConfigureDialog), configDialog);
+-	gtk_signal_connect (GTK_OBJECT (cancelButton), "clicked", GTK_SIGNAL_FUNC (CancelConfigureDialog), configDialog);
+-	gtk_signal_connect (GTK_OBJECT (fileSelectButton), "clicked", GTK_SIGNAL_FUNC (fileSelectButtonClick), configDialog);
+-
+-	/* --- Default the "Ok" button --- */
+-	GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
+-	gtk_widget_grab_default (okButton);
+-
+-	gtk_signal_connect (GTK_OBJECT (configDialog), "destroy", GTK_SIGNAL_FUNC (ClearShowMessage), NULL);
+-
+-	/* --- Show the dialog --- */
+-	gtk_widget_show (configDialog);
+-
+-	/* --- Only this window can have actions done. --- */
+-	gtk_grab_add (configDialog);
+-
+-	return;
++	gtk_widget_show_all (dialog);
++	result = gtk_dialog_run(GTK_DIALOG (dialog));
++	if (result == GTK_RESPONSE_ACCEPT) {
++		editString = gtk_editable_get_chars (
++					GTK_EDITABLE (fileEntry), 0, -1);
++		strcpy (devicesFile, editString);
++		g_free (editString);
++		LoadUSBTree (0);
++	}
++	gtk_widget_destroy (dialog);
+ }
+-
+-
+--- usbview-1.1/configure.in	2007-10-23 02:03:36.000000000 +0200
++++ usbview-1.1.new/configure.in	2012-06-14 20:25:16.629667442 +0200
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(usbview, 1.0)
++AM_INIT_AUTOMAKE(usbview, 1.1)
+ AM_CONFIG_HEADER(config.h)
+ 
+ # required versions of other packages
+@@ -12,33 +12,10 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.5)
++PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
+ AC_SUBST(GTK_FLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+-
+-dnl Set PACKAGE_LOCALE_DIR in config.h.
+-if test "x${prefix}" = "xNONE"; then
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale")
+-else
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
+-fi
+-
+-dnl Set PACKAGE_DATA_DIR in config.h.
+-if test "x${datadir}" = 'x${prefix}/share'; then
+-  if test "x${prefix}" = "xNONE"; then
+-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
+-  else
+-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+-  fi
+-else
+-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+-fi
+-
+-dnl Set PACKAGE_SOURCE_DIR in config.h.
+-packagesrcdir=`cd $srcdir && pwd`
+-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+-
+ dnl Use -Wall if we have gcc.
+ changequote(,)dnl
+ if test "x$GCC" = "xyes"; then
+--- usbview-1.1/interface.c	2009-03-11 03:11:47.000000000 +0100
++++ usbview-1.1.new/interface.c	2012-06-14 21:06:05.000523489 +0200
+@@ -32,15 +32,16 @@
+ #include "usb_icon.xpm"
+ 
+ GtkWidget *treeUSB;
++GtkTreeStore *treeStore;
+ GtkTextBuffer *textDescriptionBuffer;
+ GtkWidget *textDescriptionView;
++GtkWidget *windowMain;
+ 
+ int timer;
+ 
+ GtkWidget*
+ create_windowMain ()
+ {
+-	GtkWidget *windowMain;
+ 	GtkWidget *vbox1;
+ 	GtkWidget *hpaned1;
+ 	GtkWidget *scrolledwindow1;
+@@ -50,68 +51,61 @@
+ 	GtkWidget *buttonClose;
+ 	GtkWidget *buttonAbout;
+ 	GdkPixbuf *icon;
++	GtkCellRenderer *treeRenderer;
++	GtkTreeViewColumn *treeColumn;
+ 
+ 	windowMain = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ 	gtk_widget_set_name (windowMain, "windowMain");
+-	gtk_object_set_data (GTK_OBJECT (windowMain), "windowMain", windowMain);
+ 	gtk_window_set_title (GTK_WINDOW (windowMain), "USB Viewer");
+-	gtk_window_set_default_size (GTK_WINDOW (windowMain), 500, 300);
++	gtk_window_set_default_size (GTK_WINDOW (windowMain), 600, 300);
+ 
+ 	icon = gdk_pixbuf_new_from_xpm_data((const char **)usb_icon_xpm);
+ 	gtk_window_set_icon(GTK_WINDOW(windowMain), icon);
+ 
+-	vbox1 = gtk_vbox_new (FALSE, 0);
++	vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ 	gtk_widget_set_name (vbox1, "vbox1");
+-	gtk_widget_ref (vbox1);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "vbox1", vbox1,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (vbox1);
+ 	gtk_container_add (GTK_CONTAINER (windowMain), vbox1);
+ 
+-	hpaned1 = gtk_hpaned_new ();
++	hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+ 	gtk_widget_set_name (hpaned1, "hpaned1");
+-	gtk_widget_ref (hpaned1);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "hpaned1", hpaned1,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (hpaned1);
+ 	gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0);
+-	gtk_paned_set_position (GTK_PANED (hpaned1), 200);
+ 
+-	treeUSB = gtk_ctree_new_with_titles (1, 0, NULL);
++	treeStore = gtk_tree_store_new (N_COLUMNS,
++				G_TYPE_STRING,	/* NAME_COLUMN */
++				G_TYPE_INT,	/* DEVICE_ADDR_COLUMN */
++				G_TYPE_STRING	/* COLOR_COLUMN */);
++	treeUSB = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treeStore));
++	treeRenderer = gtk_cell_renderer_text_new ();
++	treeColumn = gtk_tree_view_column_new_with_attributes (
++					"USB devices",
++					treeRenderer,
++					"text", NAME_COLUMN,
++					"foreground", COLOR_COLUMN,
++					NULL);
++	gtk_tree_view_append_column (GTK_TREE_VIEW (treeUSB), treeColumn);
+ 	gtk_widget_set_name (treeUSB, "treeUSB");
+-	gtk_widget_ref (treeUSB);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "treeUSB", treeUSB,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (treeUSB);
+-	gtk_container_add (GTK_CONTAINER (hpaned1), treeUSB);
+-	gtk_widget_set_usize (treeUSB, 200, -2);
++	gtk_paned_pack1 (GTK_PANED (hpaned1), treeUSB, FALSE, FALSE);
+ 
+ 	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ 	gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
+-	gtk_widget_ref (scrolledwindow1);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "scrolledwindow1", scrolledwindow1,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (scrolledwindow1);
+-	gtk_container_add (GTK_CONTAINER (hpaned1), scrolledwindow1);
+ 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
++	gtk_widget_show (scrolledwindow1);
++	gtk_paned_pack2 (GTK_PANED (hpaned1), scrolledwindow1, TRUE, FALSE);
+ 
+ 	textDescriptionBuffer = gtk_text_buffer_new(NULL);
+ 	//textDescription = gtk_text_new (NULL, NULL);
+ 	textDescriptionView = gtk_text_view_new_with_buffer(textDescriptionBuffer);
+ 	gtk_widget_set_name (textDescriptionView, "textDescription");
+-	gtk_widget_ref (textDescriptionView);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "textDescription", textDescriptionView,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_text_view_set_editable(GTK_TEXT_VIEW(textDescriptionView), FALSE);
+ 	gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textDescriptionView), FALSE);
+ 	gtk_widget_show (textDescriptionView);
+ 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), textDescriptionView);
+ 
+-	hbuttonbox1 = gtk_hbutton_box_new ();
++	hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ 	gtk_widget_set_name (hbuttonbox1, "hbuttonbox1");
+-	gtk_widget_ref (hbuttonbox1);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "hbuttonbox1", hbuttonbox1,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (hbuttonbox1);
+ 	gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, FALSE, FALSE, 5);
+ 	//gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 10);
+@@ -120,58 +115,46 @@
+ 
+ 	buttonRefresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ 	gtk_widget_set_name (buttonRefresh, "buttonRefresh");
+-	gtk_widget_ref (buttonRefresh);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonRefresh", buttonRefresh,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (buttonRefresh);
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonRefresh);
+ 	gtk_container_set_border_width (GTK_CONTAINER (buttonRefresh), 4);
+-	GTK_WIDGET_SET_FLAGS (buttonRefresh, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default (buttonRefresh, TRUE);
+ 
+ 	buttonConfigure = gtk_button_new_with_label ("Configure...");
+ 	gtk_widget_set_name (buttonConfigure, "buttonConfigure");
+-	gtk_widget_ref (buttonConfigure);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonConfigure", buttonConfigure,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (buttonConfigure);
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonConfigure);
+ 	gtk_container_set_border_width (GTK_CONTAINER (buttonConfigure), 4);
+-	GTK_WIDGET_SET_FLAGS (buttonConfigure, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default (buttonConfigure, TRUE);
+ 
+ 	buttonAbout = gtk_button_new_from_stock(GTK_STOCK_ABOUT);
+ 	gtk_widget_set_name (buttonAbout, "buttonAbout");
+-	gtk_widget_ref (buttonAbout);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonAbout", buttonAbout,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (buttonAbout);
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonAbout);
+ 	gtk_container_set_border_width (GTK_CONTAINER (buttonAbout), 4);
+-	GTK_WIDGET_SET_FLAGS (buttonAbout, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default (buttonAbout, TRUE);
+ 
+ 	buttonClose = gtk_button_new_from_stock(GTK_STOCK_QUIT);
+ 	gtk_widget_set_name (buttonClose, "buttonClose");
+-	gtk_widget_ref (buttonClose);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonClose", buttonClose,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (buttonClose);
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonClose);
+ 	gtk_container_set_border_width (GTK_CONTAINER (buttonClose), 4);
+-	GTK_WIDGET_SET_FLAGS (buttonClose, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default (buttonClose, TRUE);
+ 
+-	gtk_signal_connect (GTK_OBJECT (windowMain), "delete_event",
+-			    GTK_SIGNAL_FUNC (on_window1_delete_event),
++	g_signal_connect (G_OBJECT (windowMain), "delete_event",
++			    G_CALLBACK (on_window1_delete_event),
+ 			    NULL);
+-	gtk_signal_connect (GTK_OBJECT (buttonRefresh), "clicked",
+-			    GTK_SIGNAL_FUNC (on_buttonRefresh_clicked),
++	g_signal_connect (G_OBJECT (buttonRefresh), "clicked",
++			    G_CALLBACK (on_buttonRefresh_clicked),
+ 			    NULL);
+-	gtk_signal_connect (GTK_OBJECT (buttonConfigure), "clicked",
+-			    GTK_SIGNAL_FUNC (on_buttonConfigure_clicked),
++	g_signal_connect (G_OBJECT (buttonConfigure), "clicked",
++			    G_CALLBACK (on_buttonConfigure_clicked),
+ 			    NULL);
+-	gtk_signal_connect (GTK_OBJECT (buttonAbout), "clicked",
+-			    GTK_SIGNAL_FUNC (on_buttonAbout_clicked),
++	g_signal_connect (G_OBJECT (buttonAbout), "clicked",
++			    G_CALLBACK (on_buttonAbout_clicked),
+ 			    NULL);
+-	gtk_signal_connect (GTK_OBJECT (buttonClose), "clicked",
+-			    GTK_SIGNAL_FUNC (on_buttonClose_clicked),
++	g_signal_connect (G_OBJECT (buttonClose), "clicked",
++			    G_CALLBACK (on_buttonClose_clicked),
+ 			    NULL);
+ 
+ 	/* create our timer */
+--- usbview-1.1/main.c	2008-06-25 23:03:27.000000000 +0200
++++ usbview-1.1.new/main.c	2012-06-14 21:06:05.000523489 +0200
+@@ -30,7 +30,6 @@
+ {
+ 	GtkWidget *window1;
+ 
+-	gtk_set_locale ();
+ 	gtk_init (&argc, &argv);
+ 
+ 	initialize_stuff();
+--- usbview-1.1/usbparse.h	2008-06-25 23:03:47.000000000 +0200
++++ usbview-1.1.new/usbparse.h	2012-06-14 21:06:05.000523489 +0200
+@@ -166,7 +166,7 @@
+ 	struct Device	*child[MAX_CHILDREN];
+ 	DeviceBandwidth	*bandwidth;
+ 	GtkWidget	*tree;
+-	GtkCTreeNode	*leaf;
++	GtkTreeIter	leaf;
+ } Device;
+ 
+ 
+--- usbview-1.1/usbtree.c	2012-06-14 21:08:11.672516042 +0200
++++ usbview-1.1.new/usbtree.c	2012-06-14 21:06:05.000523489 +0200
+@@ -45,7 +45,7 @@
+ 
+ 	/* blow away the tree if there is one */
+ 	if (rootDevice != NULL) {
+-		gtk_ctree_remove_node (GTK_CTREE(treeUSB), GTK_CTREE_NODE(rootDevice->leaf));
++		gtk_tree_store_clear (treeStore);
+ 	}
+ 
+ 	/* clean out the text box */
+@@ -208,32 +208,37 @@
+ }
+ 
+ 
+-void SelectItem (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer userData)
++void SelectItem (GtkTreeSelection *selection, gpointer userData)
+ {
+-	int     data;
+-	data = (int) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node);
+-
+-	PopulateListBox ((int)data);
+-
+-	return;
++	GtkTreeIter iter;
++	GtkTreeModel *model;
++	gint deviceAddr;
++
++	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
++		gtk_tree_model_get (model, &iter,
++				DEVICE_ADDR_COLUMN, &deviceAddr,
++				-1);
++		PopulateListBox (deviceAddr);
++	}
+ }
+ 
+ 
+ static void DisplayDevice (Device *parent, Device *device)
+ {
+ 	int		i;
+-	gchar		*text[1];
+ 	int		configNum;
+ 	int		interfaceNum;
+ 	gboolean	driverAttached = TRUE;
++	gint		deviceAddr;
++	const gchar	*color = "black";
+ 
+ 	if (device == NULL)
+ 		return;
+ 
+ 	/* build this node */
+-	text[0] = device->name;
+-	device->leaf = gtk_ctree_insert_node (GTK_CTREE(treeUSB), parent->leaf, NULL, text, 1, NULL, NULL, NULL, NULL, FALSE, FALSE);
+-	gtk_ctree_node_set_row_data (GTK_CTREE(treeUSB), device->leaf, (gpointer)((device->deviceNumber<<8) | (device->busNumber)));
++	deviceAddr = (device->deviceNumber << 8) | device->busNumber;
++	gtk_tree_store_append (treeStore, &device->leaf,
++			       (device->level != 0) ? &parent->leaf : NULL);
+ 
+ 	/* determine if this device has drivers attached to all interfaces */
+ 	for (configNum = 0; configNum < MAX_CONFIGS; ++configNum) {
+@@ -252,15 +257,14 @@
+ 	}
+ 
+ 	/* change the color of this leaf if there are no drivers attached to it */
+-	if (driverAttached == FALSE) {
+-		GdkColor        red;
+-		 
+-		red.red = 56000;
+-		red.green = 0;
+-		red.blue = 0;
+-		red.pixel = 0;
+-		gtk_ctree_node_set_foreground (GTK_CTREE(treeUSB), device->leaf, &red);
+-	}
++	if (driverAttached == FALSE)
++		color = "red";
++
++	gtk_tree_store_set (treeStore, &device->leaf,
++			    NAME_COLUMN, device->name,
++			    DEVICE_ADDR_COLUMN, deviceAddr,
++			    COLOR_COLUMN, color,
++			    -1);
+ 
+ 	/* create all of the children's leafs */
+ 	for (i = 0; i < MAX_CHILDREN; ++i) {
+@@ -283,11 +287,16 @@
+ 
+ static void FileError (void)
+ {
+-	gchar *tempString = g_malloc0(strlen (verifyMessage) + strlen (devicesFile) + 50);
+-	sprintf (tempString, " Can not open the file %s \n\n%s", devicesFile, verifyMessage);
+-	ShowMessage ("USBView Error", tempString, FALSE);
+-	g_free (tempString);
+-	return;
++	GtkWidget *dialog;
++
++	dialog = gtk_message_dialog_new (
++				    GTK_WINDOW (windowMain),
++				    GTK_DIALOG_DESTROY_WITH_PARENT,
++				    GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
++				    "Can not open the file %s\n\n%s",
++				    devicesFile, verifyMessage);
++	gtk_dialog_run (GTK_DIALOG (dialog));
++	gtk_widget_destroy (dialog);
+ }
+ 
+ 
+@@ -328,10 +337,6 @@
+ 	int             finished;
+ 	int             i;
+ 
+-	if (MessageShown() == TRUE) {
+-		return;
+-	}
+-
+ 	/* if refresh is selected, then always do a refresh, otherwise look at the file first */
+ 	if (!refresh) {
+ 		if (!FileHasChanged()) {
+@@ -368,11 +373,5 @@
+ 	usb_name_devices ();
+ 
+-	/* set up our tree */
+-	gtk_ctree_set_line_style (GTK_CTREE(treeUSB), GTK_CTREE_LINES_DOTTED);
+-	gtk_ctree_set_expander_style (GTK_CTREE(treeUSB), GTK_CTREE_EXPANDER_SQUARE);
+-	gtk_ctree_set_indent (GTK_CTREE(treeUSB),10);
+-	gtk_clist_column_titles_passive (GTK_CLIST(treeUSB));
+-
+ 	/* build our tree */
+ 	for (i = 0; i < rootDevice->maxChildren; ++i) {
+ 		DisplayDevice (rootDevice, rootDevice->child[i]);
+@@ -380,11 +386,14 @@
+ 
+ 	gtk_widget_show (treeUSB);
+ 
+-	gtk_ctree_expand_recursive (GTK_CTREE(treeUSB), NULL);
++	gtk_tree_view_expand_all (GTK_TREE_VIEW (treeUSB));
+ 
+ 	/* hook up our callback function to this tree if we haven't yet */
+ 	if (!signal_connected) {
+-		gtk_signal_connect (GTK_OBJECT (treeUSB), "tree-select-row", GTK_SIGNAL_FUNC (SelectItem), NULL);
++		GtkTreeSelection *select;
++		select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeUSB));
++		g_signal_connect (G_OBJECT (select), "changed",
++				  G_CALLBACK (SelectItem), NULL);
+ 		signal_connected = TRUE;
+ 	}
+ 
+--- usbview-1.1/usbtree.h	2008-06-25 23:03:52.000000000 +0200
++++ usbview-1.1.new/usbtree.h	2012-06-14 21:06:05.000523489 +0200
+@@ -21,16 +21,24 @@
+ #ifndef __USB_TREE_H
+ #define __USB_TREE_H
+ 
++enum {
++	NAME_COLUMN,
++	DEVICE_ADDR_COLUMN,
++	COLOR_COLUMN,
++	N_COLUMNS
++};
++
+ extern gchar		devicesFile[1000];
++extern GtkTreeStore	*treeStore;
+ extern GtkWidget	*treeUSB;
+ extern GtkWidget	*textDescriptionView;
+ extern GtkTextBuffer	*textDescriptionBuffer;
++extern GtkWidget	*windowMain;
+ 
+ extern void	LoadUSBTree		(int refresh);
+ extern void	initialize_stuff	(void);
+ extern GtkWidget * create_windowMain	(void);
+ extern void	configure_dialog	(void);
+-extern void	about_dialog		(void);
+ 
+ extern void	on_buttonClose_clicked		(GtkButton *button, gpointer user_data);
+ extern gboolean	on_window1_delete_event		(GtkWidget *widget, GdkEvent *event, gpointer user_data);
+@@ -39,8 +47,4 @@
+ extern void	on_buttonAbout_clicked		(GtkButton *button, gpointer user_data);
+ extern gint	on_timer_timeout		(gpointer user_data);
+ 
+-extern void	ShowMessage	(gchar *title, gchar *message, gboolean centered);
+-extern gboolean	MessageShown	(void);
+-
+-
+ #endif	/* __USB_TREE_H */
diff --git a/usbview-1.1-no-more-procbususb.patch b/usbview-1.1-no-more-procbususb.patch
new file mode 100644
index 0000000..8e03bc8
--- /dev/null
+++ b/usbview-1.1-no-more-procbususb.patch
@@ -0,0 +1,24 @@
+diff -up usbview-1.1/usbtree.c~ usbview-1.1/usbtree.c
+--- usbview-1.1/usbtree.c~	2009-03-11 02:40:28.000000000 +0100
++++ usbview-1.1/usbtree.c	2012-06-14 16:37:15.512570539 +0200
+@@ -395,7 +395,7 @@ void LoadUSBTree (int refresh)
+ 
+ void initialize_stuff (void)
+ {
+-	strcpy (devicesFile, "/proc/bus/usb/devices");
++	strcpy (devicesFile, "/sys/kernel/debug/usb/devices");
+ 	memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile));
+ 	previousChange = 0;
+ 
+diff -up usbview-1.1/usbview.8~ usbview-1.1/usbview.8
+--- usbview-1.1/usbview.8~	2009-03-11 02:48:48.000000000 +0100
++++ usbview-1.1/usbview.8	2012-06-14 16:46:17.156538694 +0200
+@@ -15,7 +15,7 @@ No command line options are accepted by
+ .B usbview.
+ .SH FILES
+ .TP
+-.B /proc/bus/usb/devices
++.B /sys/kernel/debug/usb/devices
+ Kernel file providing information on USB devices attached to
+ the machine.
+ .SH SEE ALSO
diff --git a/usbview.desktop b/usbview.desktop
index 6f455e2..6f31b8a 100644
--- a/usbview.desktop
+++ b/usbview.desktop
@@ -3,7 +3,7 @@ Name=USB Viewer
 GenericName=USB Viewer
 Comment=USB topology and device viewer
 Exec=usbview
-Icon=usbview_icon
+Icon=usbview
 Terminal=false
 Type=Application
 Categories=System;
diff --git a/usbview.spec b/usbview.spec
index 5344afd..20b449a 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,30 +1,28 @@
 Name:           usbview
 Version:        1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        USB topology and device viewer
-
 Group:          Applications/System
 License:        GPLv2
 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
-
+Source1:        %{name}.desktop
+Patch0:         usbview-1.1-no-more-procbususb.patch
+Patch1:         usbview-1.1-gtk3-port.patch
+BuildRequires:  gtk3-devel automake desktop-file-utils
+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
+%patch0 -p1
+%patch1 -p1
+autoreconf -f -i
 # Convert to utf-8
 for file in ChangeLog; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
@@ -32,38 +30,53 @@ for file in ChangeLog; do
     mv $file.new $file
 done
 
+
 %build
 %configure
 make %{?_smp_mflags}
 
 
 %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 -Dp -m 0644 usb_icon.xpm \
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.xpm
 
 #install desktop file
 desktop-file-install                                    \
 --vendor fedora                                         \
 --add-category="System"                                 \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
-%{SOURCE2}
+%{SOURCE1}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%defattr(-,root,root,-)
 %doc ChangeLog COPYING* README TODO
 %{_bindir}/usbview
 %{_mandir}/man8/usbview*
-%{_datadir}/pixmaps/%{name}_icon.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.xpm
 %{_datadir}/applications/fedora-%{name}.desktop
 
+
 %changelog
+* Thu Jun 14 2012 Hans de Goede <hdegoede@redhat.com> - 1.1-8
+- Fix usbview not working due to missing usbfs (rhbz#806595)
+- Port to gtk3
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/usbview_icon.png b/usbview_icon.png
deleted file mode 100644
index 85d1b812e098740311f9743992bc447ca354a762..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1425
zcmV;C1#bF@P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXh@
z6B__rLR<6z00j|AL_t(|+U=W5Y!r1I$3HW>+irK+(qflVkd`VX)OJ%KSV@SOC>V$r
zqX!-_3L;VCiA%4h*Iqn&z@)_(E0X9zlO{$)tBr^SENy8^dD$0ip$~0om+oUc{Pxv$
zy9;Hh-I@6&)6M>8W;@^S|NDFVCo>AEp^@287PE66X-A$LMNu<?v8IKX8o&Ecd=m(u
zXrNJ0T0!OB!xV1XMq$}j?5_Nbns(pB7~bAX4EJ85y{VpiH#@_0H6@t<nrg99eXxd|
zhd;(*%R&zb`e$fqsO5ZP9id=g7H=hf=2eS@{hyp+ebp}Xi2k-_P91-RP%s#Ef*Ol?
zjp~Cnx+M>=zG@fM2WuiJPK$SdR!~~OJ0~vc#`ej=;pDMx;haD$t$X$z(LH$pi!BS!
zz9Z4^YQzew%eG<^#BtT44k$E`0P$SaNRyLkb^dW+cje>AbH@b8lnyVg{c)JH@tDtn
zDS#<}DS#<}DS(k-T}~JCR1R!$Lyiruk3-jpfdqIq4~|rVE$qn`*TK0V`1YF41Xy8%
zr(LoR4*?+!f*Ksy93vmWj<s;X3w;wh5Ws1JH_D)*AjNIkIVjH6fdDJB;e#qzWrzEI
z=pBQZ5U2`R6#4WN$md*)KgjS9aN6LQN67b#LSr{f2j(BQrv!GF%pUVjLHB3|3t+dx
zdmeB*WY#~w0)bHCV}JY`d;xgA2pm?a0^i?Q`1mCgz-fc+g|N;g-v=k4)hkv`b>2}A
ztX%=O{(+O7$;oKIuY<BJn?7JuKJ4EtnLC0iH@vhSzV2Dro-4Cu=2tu5*1u5S0saun
z5^A!<b*Owc`S{sAR1W#}`TGhT@L`pZ?-_;9E`u+)bcA-7zzaoSRUgv<FBd~j5`Sb{
zV0ST`zA9yHjT5SiU`LT;^R~Nis#|LOQeu@|66&53XdZxbw_zr@2mwlRQ~$Fqt6^h4
z<YvW6n1<wswJYHGc5#bEfnZ3S@T3KCg&ph4g4dpriEJ5!mLZt(KY{>>tUvE$74ouY
zk1630an3#80uI~K$9RraoH^----jMSfPqOUUzPmFuZ_bOSCSu-mo2s|&V_A-;+F9T
z(AXt)KHYeIqc{^_cuK<HqIY5EEhs?iozw#Sc_(pG6OZWt+`bQ;BXG744wTF99`(SN
zUC@>0Mkk<2+5LF{x<^t!-LYV<?6@Z)EQG&?WqTC(f^f0}&h&xJ0&hJBr7P1bK+_HQ
zv`v=M50h?^7K_tY;hSC<^To!-d@}Y`_u?*41Ae$A7iv}E?Fw+`q)&iJf0{eNKW@tw
zNox1~>ABEf2Bg>6xeng-z=_K+>PvjArvN<e#QV<nNr*l1wLrRv$K$)}B0^;We6$rB
zI-ozn(szwhI?zP8;C(y+{?~hg8j=WGy;64Huac6rAs33AQaxN*vZ&JSEwP{mr+Z*z
z8eZK1Z<Z~i#n4jXr#={(lyI<HrPa1uBvCqT5-PeD0AzKUXoZ>RX2}y@4H^a3Ot{G3
z1|?A@tot(t5MVlxy5%-Qz!bm~z!bm~z!bm~z!YFn0%%&uaKs~=Re-7SyZ9!?3`5>G
zF&2HPDjEXb-b;oNAfBsA_<@aK0|^kvHTIZzds96@|BUX*2mLd&H`ULt0{3oq($Y|?
zdjVP+Y9sFp%@RNXh4YPd^tUzZmVAF(Gv^!YB2gdv6JH$+{NiME$k4COMx8Ksz(6lg
frxqi_kd)(p3cIfFH44vY00000NkvXXu0mjfpYD^n


From f52eaa06b6e80ad93a3803e6253d99b09390db03 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 21 Jul 2012 21:11:41 -0500
Subject: [PATCH 05/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 20b449a..adbfef0 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -73,6 +73,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Thu Jun 14 2012 Hans de Goede <hdegoede@redhat.com> - 1.1-8
 - Fix usbview not working due to missing usbfs (rhbz#806595)
 - Port to gtk3

From 1dcea31e0c9440bcc8e57b8de7aed64f670cc8f3 Mon Sep 17 00:00:00 2001
From: Parag Nemade <paragn@fedoraproject.org>
Date: Sat, 9 Feb 2013 21:16:20 +0530
Subject: [PATCH 06/45] Remove vendor tag from desktop file as per
 https://fedorahosted.org/fesco/ticket/1077

---
 usbview.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usbview.spec b/usbview.spec
index adbfef0..45504a7 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -45,7 +45,6 @@ install -Dp -m 0644 usb_icon.xpm \
 
 #install desktop file
 desktop-file-install                                    \
---vendor fedora                                         \
 --add-category="System"                                 \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
 %{SOURCE1}
@@ -69,10 +68,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/usbview
 %{_mandir}/man8/usbview*
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.xpm
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Sat Feb 09 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.1-10
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From 1e4989902b546dc77d8783ef098b0ac0ca800a41 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 6 Apr 2013 20:28:08 +0200
Subject: [PATCH 07/45] 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.
---
 org.fedoraproject.usbview.policy     |  37 ++
 sources                              |   1 -
 usbview-1.1-gtk3-port.patch          | 802 ---------------------------
 usbview-1.1-no-more-procbususb.patch |  24 -
 usbview.spec                         |  37 +-
 5 files changed, 65 insertions(+), 836 deletions(-)
 create mode 100644 org.fedoraproject.usbview.policy
 delete mode 100644 usbview-1.1-gtk3-port.patch
 delete mode 100644 usbview-1.1-no-more-procbususb.patch

diff --git a/org.fedoraproject.usbview.policy b/org.fedoraproject.usbview.policy
new file mode 100644
index 0000000..a40d9f0
--- /dev/null
+++ b/org.fedoraproject.usbview.policy
@@ -0,0 +1,37 @@
+<?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>
diff --git a/sources b/sources
index 96f571e..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-8bf5e66351156356f3ad07454123affa  usbview-1.1.tar.gz
diff --git a/usbview-1.1-gtk3-port.patch b/usbview-1.1-gtk3-port.patch
deleted file mode 100644
index 41c306c..0000000
--- a/usbview-1.1-gtk3-port.patch
+++ /dev/null
@@ -1,802 +0,0 @@
---- usbview-1.1/Makefile.am	2009-03-11 03:25:46.000000000 +0100
-+++ usbview-1.1.new/Makefile.am	2012-06-14 20:33:10.641639573 +0200
-@@ -16,10 +16,8 @@
- 	interface.c		\
- 	callbacks.c		\
- 	usbtree.c usbtree.h	\
--	showmessage.c		\
- 	usbparse.c usbparse.h	\
- 	configure-dialog.c      \
--	about-dialog.c		\
- 	usbview_logo.xpm	\
- 	usbview_logo.xcf	\
- 	usb_icon.xpm		\
---- usbview-1.1/callbacks.c	2008-06-25 23:03:13.000000000 +0200
-+++ usbview-1.1.new/callbacks.c	2012-06-14 21:06:05.000523489 +0200
-@@ -23,13 +23,13 @@
- #endif
- 
- #include <gtk/gtk.h>
--
- #include "usbtree.h"
-+#include "usbview_logo.xpm"	/* logo */
- 
- 
- void on_buttonClose_clicked (GtkButton *button, gpointer user_data)
- {
--	gtk_exit(0);
-+	gtk_main_quit();
- }
- 
- 
-@@ -55,7 +55,21 @@
- 
- void on_buttonAbout_clicked (GtkButton *button, gpointer user_data)
- {
--	about_dialog ();
-+	GdkPixbuf *logo;
-+	gchar *authors[] = { "Greg Kroah-Hartman <greg@kroah.com>", NULL };
-+
-+	logo = gdk_pixbuf_new_from_xpm_data ((const char **)usbview_logo_xpm);
-+	gtk_show_about_dialog (GTK_WINDOW (windowMain),
-+		"logo", logo,
-+		"program-name", "usbview",
-+		"version", VERSION,
-+		"comments", "Display information on USB devices",
-+		"website-label", "http://www.kroah.com/linux-usb/",
-+		"website", "http://www.kroah.com/linux-usb/",
-+		"copyright", "Copyright © 1999-2012",
-+		"authors", authors,
-+		NULL);
-+	g_object_unref (logo);
- }
- 
- 
---- usbview-1.1/configure-dialog.c	2009-03-11 02:40:28.000000000 +0100
-+++ usbview-1.1.new/configure-dialog.c	2012-06-14 21:06:05.000523489 +0200
-@@ -24,264 +24,78 @@
- #endif
- 
- #include <gtk/gtk.h>
--#include <stdio.h>
--#include <stdlib.h>
- #include <string.h>
--#include <ctype.h>
--
- #include "usbtree.h"
- #include "usbparse.h"
- 
--
--
--
- static	GtkWidget	*fileEntry;
--static	GtkWidget	*filew;
--static	char		*sFilename;
--
--/* 
-- * Get the selected filename and print it to the console 
-- */
--static void file_ok_sel (GtkWidget *w, GtkFileSelection *fs)
--{
--	const char *sTempFile;
--
--	/* --- Get the name --- */
--	sTempFile = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));
--
--	/* --- Allocate space and save it. --- */
--	sFilename = malloc (sizeof (char) * (strlen (sTempFile) + 1));
--	strcpy (sFilename, sTempFile);
--
--	/* --- Destroy the file selection --- */
--	gtk_widget_destroy (filew);
--}
--
--
--static void file_cancel_sel (GtkWidget *w, GtkFileSelection *fs)
--{
--	/* --- Destroy the file selection --- */
--	gtk_widget_destroy (filew);
--}
--
--
--/*
-- * DestroyDialog
-- *
-- * Destroy the dialog (obvious, eh?) but also remove the
-- * grab and close the modal. 
-- */
--static int DestroyDialog (GtkWidget *widget, gpointer *data)
--{
--	gtk_grab_remove (widget);
--	gtk_main_quit ();
--	return(FALSE);
--}
--
--
--/*
-- * GetFilename 
-- */
--static char *GetFilename (char *sTitle, char *initialFilename)
--{
--	sFilename = NULL;
--
--	/* --- Create a new file selection widget --- */
--	filew = gtk_file_selection_new (sTitle);
--
--	/* --- If it's destroyed --- */
--	gtk_signal_connect (GTK_OBJECT (filew), "destroy", (GtkSignalFunc) DestroyDialog, &filew);
--
--	/* --- Connect the ok_button to file_ok_sel function  --- */
--	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->ok_button), "clicked", (GtkSignalFunc) file_ok_sel, filew );
--
--	/* --- Connect the cancel_button to destroy the widget  --- */
--	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->cancel_button), "clicked", (GtkSignalFunc) file_cancel_sel, filew);
--
--	/* --- Lets set the filename --- */
--	gtk_file_selection_set_filename (GTK_FILE_SELECTION(filew), initialFilename);
--
--	/* --- Turn off the file operation buttons --- */
--	gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION(filew));
--
--	/* --- Of course, we show it --- */
--	gtk_widget_show (filew);
--
--	/* --- Make sure we keep the focus --- */
--	gtk_grab_add (filew);
--
--	gtk_main ();
--
--	return(sFilename);
--}
--
--
--static void ClearShowMessage (GtkWidget *widget, gpointer data)
--{
--	gtk_grab_remove (widget);
--}
--
--static void CancelConfigureDialog (GtkWidget *widget, gpointer data)
--{
--	GtkWidget *dialogWidget = (GtkWidget *) data;
--
--	gtk_grab_remove (dialogWidget);
--
--	/* --- Close the widget --- */
--	gtk_widget_destroy (dialogWidget);
--}
--
--static void OkConfigureDialog (GtkWidget *widget, gpointer data)
--{
--	GtkWidget       *dialogWidget = (GtkWidget *) data;
--	gchar           *editString;
--
--	editString = gtk_editable_get_chars (GTK_EDITABLE (fileEntry), 0, -1);
--
--	gtk_grab_remove (dialogWidget);
--
--	/* --- Close the widget --- */
--	gtk_widget_destroy (dialogWidget);
--
--	strcpy (devicesFile, editString);
--	g_free (editString);
--	LoadUSBTree(0);
--}
--
- 
- static void fileSelectButtonClick (GtkWidget *widget, gpointer data)
- {
--	gchar   *newFilename;
-+	GtkWidget *dialog;
-+	gchar *filename;
- 
--	newFilename = GetFilename ("locate usbdevfs devices file", devicesFile);
--
--	if (newFilename != NULL) {
--		gtk_entry_set_text (GTK_ENTRY (fileEntry), newFilename);
--		gtk_widget_show (fileEntry);
--		g_free (newFilename);
-+	dialog = gtk_file_chooser_dialog_new (
-+				"locate usbdevfs devices file",
-+				GTK_WINDOW (windowMain),
-+				GTK_FILE_CHOOSER_ACTION_OPEN,
-+				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-+				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-+				NULL);
-+
-+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-+	{
-+		filename = gtk_file_chooser_get_filename(
-+						GTK_FILE_CHOOSER (dialog));
-+		gtk_entry_set_text (GTK_ENTRY (fileEntry), filename);
-+		g_free (filename);
- 	}
-+			  
-+	gtk_widget_destroy (dialog);
- }
- 
--
- void configure_dialog (void)
- {
--	GtkWidget *configDialog;
--	GtkWidget *dialog_vbox2;
-+	GtkWidget *dialog, *content_area;
- 	GtkWidget *hbox1;
- 	GtkWidget *label1;
--	GtkWidget *label41;
--	GtkWidget *label42;
--	GtkWidget *label43;
--	GtkWidget *vbox1;
--	GtkWidget *dialog_action_area2;
--	GtkWidget *hbuttonbox2;
--	GtkWidget *okButton;
--	GtkWidget *cancelButton;
- 	GtkWidget *fileSelectButton;
-+	gchar *editString;
-+	gint result;
- 
--	configDialog = gtk_dialog_new ();
--	gtk_object_set_data (GTK_OBJECT (configDialog), "configDialog", configDialog);
--	gtk_window_set_title (GTK_WINDOW (configDialog), "USB View Configuration");
--	gtk_window_set_policy (GTK_WINDOW (configDialog), TRUE, TRUE, FALSE);
--
--	dialog_vbox2 = GTK_DIALOG (configDialog)->vbox;
--	gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_vbox2", dialog_vbox2);
--	gtk_widget_show (dialog_vbox2);
--
--	vbox1 = gtk_vbox_new (FALSE, 0);
--	gtk_widget_ref (vbox1);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (vbox1);
--	gtk_box_pack_start (GTK_BOX (dialog_vbox2), vbox1, TRUE, TRUE, 0);
--
--	label41 = gtk_label_new ("");
--	gtk_widget_ref (label41);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label41", label41, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (label41);
--	gtk_box_pack_start (GTK_BOX (vbox1), label41, FALSE, FALSE, 0);
--
--	hbox1 = gtk_hbox_new (FALSE, 0);
--	gtk_widget_ref (hbox1);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbox1", hbox1, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (hbox1);
--//	gtk_box_pack_start (GTK_BOX (dialog_vbox2), hbox1, TRUE, TRUE, 0);
--	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0);
--
--	label42 = gtk_label_new ("");
--	gtk_widget_ref (label42);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label42", label42, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (label42);
--	gtk_box_pack_start (GTK_BOX (vbox1), label42, FALSE, FALSE, 0);
--
--
--	label1 = gtk_label_new ("  Location of usbdevfs devices file");
--	gtk_widget_ref (label1);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label1", label1, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (label1);
-+	dialog = gtk_dialog_new_with_buttons (
-+				"USB View Configuration",
-+				GTK_WINDOW (windowMain),
-+				GTK_DIALOG_DESTROY_WITH_PARENT,
-+				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-+				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-+				NULL);
-+
-+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-+
-+	hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-+	gtk_container_add (GTK_CONTAINER (content_area), hbox1);
-+
-+	label1 = gtk_label_new ("Location of usbdevfs devices file");
- 	gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5);
- 
- 	fileEntry = gtk_entry_new ();
--	gtk_widget_ref (fileEntry);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileEntry", fileEntry, (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_entry_set_text (GTK_ENTRY (fileEntry), devicesFile);
--	gtk_widget_show (fileEntry);
- 	gtk_box_pack_start (GTK_BOX (hbox1), fileEntry, TRUE, TRUE, 0);
- 
--	dialog_action_area2 = GTK_DIALOG (configDialog)->action_area;
--	gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_action_area2", dialog_action_area2);
--	gtk_widget_show (dialog_action_area2);
--	gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area2), 1);
--
--	hbuttonbox2 = gtk_hbutton_box_new ();
--	gtk_widget_ref (hbuttonbox2);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbuttonbox2", hbuttonbox2, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (hbuttonbox2);
--	gtk_box_pack_start (GTK_BOX (dialog_action_area2), hbuttonbox2, TRUE, TRUE, 11);
--
--	okButton = gtk_button_new_with_label ("  OK  ");
--	gtk_widget_ref (okButton);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "okButton", okButton, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (okButton);
--	gtk_container_add (GTK_CONTAINER (hbuttonbox2), okButton);
--	GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
--
--	cancelButton = gtk_button_new_with_label ("  Cancel  ");
--	gtk_widget_ref (cancelButton);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "cancelButton", cancelButton, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (cancelButton);
--	gtk_container_add (GTK_CONTAINER (hbuttonbox2), cancelButton);
--	GTK_WIDGET_SET_FLAGS (cancelButton, GTK_CAN_DEFAULT);
--
- 	fileSelectButton = gtk_button_new_with_label ("...");
--	gtk_widget_ref (fileSelectButton);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileSelectButton", fileSelectButton, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (fileSelectButton);
--
-+	g_signal_connect (G_OBJECT (fileSelectButton), "clicked",
-+			  G_CALLBACK (fileSelectButtonClick), NULL);
- 	gtk_box_pack_start (GTK_BOX (hbox1), fileSelectButton, TRUE, FALSE, 1);
- 
--	label43 = gtk_label_new ("    ");
--	gtk_widget_ref (label43);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label43", label43, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (label43);
--	gtk_box_pack_start (GTK_BOX (hbox1), label43, FALSE, FALSE, 0);
--	
--	gtk_signal_connect (GTK_OBJECT (okButton), "clicked", GTK_SIGNAL_FUNC (OkConfigureDialog), configDialog);
--	gtk_signal_connect (GTK_OBJECT (cancelButton), "clicked", GTK_SIGNAL_FUNC (CancelConfigureDialog), configDialog);
--	gtk_signal_connect (GTK_OBJECT (fileSelectButton), "clicked", GTK_SIGNAL_FUNC (fileSelectButtonClick), configDialog);
--
--	/* --- Default the "Ok" button --- */
--	GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
--	gtk_widget_grab_default (okButton);
--
--	gtk_signal_connect (GTK_OBJECT (configDialog), "destroy", GTK_SIGNAL_FUNC (ClearShowMessage), NULL);
--
--	/* --- Show the dialog --- */
--	gtk_widget_show (configDialog);
--
--	/* --- Only this window can have actions done. --- */
--	gtk_grab_add (configDialog);
--
--	return;
-+	gtk_widget_show_all (dialog);
-+	result = gtk_dialog_run(GTK_DIALOG (dialog));
-+	if (result == GTK_RESPONSE_ACCEPT) {
-+		editString = gtk_editable_get_chars (
-+					GTK_EDITABLE (fileEntry), 0, -1);
-+		strcpy (devicesFile, editString);
-+		g_free (editString);
-+		LoadUSBTree (0);
-+	}
-+	gtk_widget_destroy (dialog);
- }
--
--
---- usbview-1.1/configure.in	2007-10-23 02:03:36.000000000 +0200
-+++ usbview-1.1.new/configure.in	2012-06-14 20:25:16.629667442 +0200
-@@ -1,7 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- AC_INIT(configure.in)
--AM_INIT_AUTOMAKE(usbview, 1.0)
-+AM_INIT_AUTOMAKE(usbview, 1.1)
- AM_CONFIG_HEADER(config.h)
- 
- # required versions of other packages
-@@ -12,33 +12,10 @@
- AM_PROG_CC_STDC
- AC_HEADER_STDC
- 
--PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.5)
-+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
- AC_SUBST(GTK_FLAGS)
- AC_SUBST(GTK_LIBS)
- 
--
--dnl Set PACKAGE_LOCALE_DIR in config.h.
--if test "x${prefix}" = "xNONE"; then
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale")
--else
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
--fi
--
--dnl Set PACKAGE_DATA_DIR in config.h.
--if test "x${datadir}" = 'x${prefix}/share'; then
--  if test "x${prefix}" = "xNONE"; then
--    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
--  else
--    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
--  fi
--else
--  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
--fi
--
--dnl Set PACKAGE_SOURCE_DIR in config.h.
--packagesrcdir=`cd $srcdir && pwd`
--AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
--
- dnl Use -Wall if we have gcc.
- changequote(,)dnl
- if test "x$GCC" = "xyes"; then
---- usbview-1.1/interface.c	2009-03-11 03:11:47.000000000 +0100
-+++ usbview-1.1.new/interface.c	2012-06-14 21:06:05.000523489 +0200
-@@ -32,15 +32,16 @@
- #include "usb_icon.xpm"
- 
- GtkWidget *treeUSB;
-+GtkTreeStore *treeStore;
- GtkTextBuffer *textDescriptionBuffer;
- GtkWidget *textDescriptionView;
-+GtkWidget *windowMain;
- 
- int timer;
- 
- GtkWidget*
- create_windowMain ()
- {
--	GtkWidget *windowMain;
- 	GtkWidget *vbox1;
- 	GtkWidget *hpaned1;
- 	GtkWidget *scrolledwindow1;
-@@ -50,68 +51,61 @@
- 	GtkWidget *buttonClose;
- 	GtkWidget *buttonAbout;
- 	GdkPixbuf *icon;
-+	GtkCellRenderer *treeRenderer;
-+	GtkTreeViewColumn *treeColumn;
- 
- 	windowMain = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- 	gtk_widget_set_name (windowMain, "windowMain");
--	gtk_object_set_data (GTK_OBJECT (windowMain), "windowMain", windowMain);
- 	gtk_window_set_title (GTK_WINDOW (windowMain), "USB Viewer");
--	gtk_window_set_default_size (GTK_WINDOW (windowMain), 500, 300);
-+	gtk_window_set_default_size (GTK_WINDOW (windowMain), 600, 300);
- 
- 	icon = gdk_pixbuf_new_from_xpm_data((const char **)usb_icon_xpm);
- 	gtk_window_set_icon(GTK_WINDOW(windowMain), icon);
- 
--	vbox1 = gtk_vbox_new (FALSE, 0);
-+	vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- 	gtk_widget_set_name (vbox1, "vbox1");
--	gtk_widget_ref (vbox1);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "vbox1", vbox1,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (vbox1);
- 	gtk_container_add (GTK_CONTAINER (windowMain), vbox1);
- 
--	hpaned1 = gtk_hpaned_new ();
-+	hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- 	gtk_widget_set_name (hpaned1, "hpaned1");
--	gtk_widget_ref (hpaned1);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "hpaned1", hpaned1,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (hpaned1);
- 	gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0);
--	gtk_paned_set_position (GTK_PANED (hpaned1), 200);
- 
--	treeUSB = gtk_ctree_new_with_titles (1, 0, NULL);
-+	treeStore = gtk_tree_store_new (N_COLUMNS,
-+				G_TYPE_STRING,	/* NAME_COLUMN */
-+				G_TYPE_INT,	/* DEVICE_ADDR_COLUMN */
-+				G_TYPE_STRING	/* COLOR_COLUMN */);
-+	treeUSB = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treeStore));
-+	treeRenderer = gtk_cell_renderer_text_new ();
-+	treeColumn = gtk_tree_view_column_new_with_attributes (
-+					"USB devices",
-+					treeRenderer,
-+					"text", NAME_COLUMN,
-+					"foreground", COLOR_COLUMN,
-+					NULL);
-+	gtk_tree_view_append_column (GTK_TREE_VIEW (treeUSB), treeColumn);
- 	gtk_widget_set_name (treeUSB, "treeUSB");
--	gtk_widget_ref (treeUSB);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "treeUSB", treeUSB,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (treeUSB);
--	gtk_container_add (GTK_CONTAINER (hpaned1), treeUSB);
--	gtk_widget_set_usize (treeUSB, 200, -2);
-+	gtk_paned_pack1 (GTK_PANED (hpaned1), treeUSB, FALSE, FALSE);
- 
- 	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
- 	gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
--	gtk_widget_ref (scrolledwindow1);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "scrolledwindow1", scrolledwindow1,
--				  (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (scrolledwindow1);
--	gtk_container_add (GTK_CONTAINER (hpaned1), scrolledwindow1);
- 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-+	gtk_widget_show (scrolledwindow1);
-+	gtk_paned_pack2 (GTK_PANED (hpaned1), scrolledwindow1, TRUE, FALSE);
- 
- 	textDescriptionBuffer = gtk_text_buffer_new(NULL);
- 	//textDescription = gtk_text_new (NULL, NULL);
- 	textDescriptionView = gtk_text_view_new_with_buffer(textDescriptionBuffer);
- 	gtk_widget_set_name (textDescriptionView, "textDescription");
--	gtk_widget_ref (textDescriptionView);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "textDescription", textDescriptionView,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_text_view_set_editable(GTK_TEXT_VIEW(textDescriptionView), FALSE);
- 	gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textDescriptionView), FALSE);
- 	gtk_widget_show (textDescriptionView);
- 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), textDescriptionView);
- 
--	hbuttonbox1 = gtk_hbutton_box_new ();
-+	hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- 	gtk_widget_set_name (hbuttonbox1, "hbuttonbox1");
--	gtk_widget_ref (hbuttonbox1);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "hbuttonbox1", hbuttonbox1,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (hbuttonbox1);
- 	gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, FALSE, FALSE, 5);
- 	//gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 10);
-@@ -120,58 +115,46 @@
- 
- 	buttonRefresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
- 	gtk_widget_set_name (buttonRefresh, "buttonRefresh");
--	gtk_widget_ref (buttonRefresh);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonRefresh", buttonRefresh,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (buttonRefresh);
- 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonRefresh);
- 	gtk_container_set_border_width (GTK_CONTAINER (buttonRefresh), 4);
--	GTK_WIDGET_SET_FLAGS (buttonRefresh, GTK_CAN_DEFAULT);
-+	gtk_widget_set_can_default (buttonRefresh, TRUE);
- 
- 	buttonConfigure = gtk_button_new_with_label ("Configure...");
- 	gtk_widget_set_name (buttonConfigure, "buttonConfigure");
--	gtk_widget_ref (buttonConfigure);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonConfigure", buttonConfigure,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (buttonConfigure);
- 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonConfigure);
- 	gtk_container_set_border_width (GTK_CONTAINER (buttonConfigure), 4);
--	GTK_WIDGET_SET_FLAGS (buttonConfigure, GTK_CAN_DEFAULT);
-+	gtk_widget_set_can_default (buttonConfigure, TRUE);
- 
- 	buttonAbout = gtk_button_new_from_stock(GTK_STOCK_ABOUT);
- 	gtk_widget_set_name (buttonAbout, "buttonAbout");
--	gtk_widget_ref (buttonAbout);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonAbout", buttonAbout,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (buttonAbout);
- 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonAbout);
- 	gtk_container_set_border_width (GTK_CONTAINER (buttonAbout), 4);
--	GTK_WIDGET_SET_FLAGS (buttonAbout, GTK_CAN_DEFAULT);
-+	gtk_widget_set_can_default (buttonAbout, TRUE);
- 
- 	buttonClose = gtk_button_new_from_stock(GTK_STOCK_QUIT);
- 	gtk_widget_set_name (buttonClose, "buttonClose");
--	gtk_widget_ref (buttonClose);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonClose", buttonClose,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (buttonClose);
- 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonClose);
- 	gtk_container_set_border_width (GTK_CONTAINER (buttonClose), 4);
--	GTK_WIDGET_SET_FLAGS (buttonClose, GTK_CAN_DEFAULT);
-+	gtk_widget_set_can_default (buttonClose, TRUE);
- 
--	gtk_signal_connect (GTK_OBJECT (windowMain), "delete_event",
--			    GTK_SIGNAL_FUNC (on_window1_delete_event),
-+	g_signal_connect (G_OBJECT (windowMain), "delete_event",
-+			    G_CALLBACK (on_window1_delete_event),
- 			    NULL);
--	gtk_signal_connect (GTK_OBJECT (buttonRefresh), "clicked",
--			    GTK_SIGNAL_FUNC (on_buttonRefresh_clicked),
-+	g_signal_connect (G_OBJECT (buttonRefresh), "clicked",
-+			    G_CALLBACK (on_buttonRefresh_clicked),
- 			    NULL);
--	gtk_signal_connect (GTK_OBJECT (buttonConfigure), "clicked",
--			    GTK_SIGNAL_FUNC (on_buttonConfigure_clicked),
-+	g_signal_connect (G_OBJECT (buttonConfigure), "clicked",
-+			    G_CALLBACK (on_buttonConfigure_clicked),
- 			    NULL);
--	gtk_signal_connect (GTK_OBJECT (buttonAbout), "clicked",
--			    GTK_SIGNAL_FUNC (on_buttonAbout_clicked),
-+	g_signal_connect (G_OBJECT (buttonAbout), "clicked",
-+			    G_CALLBACK (on_buttonAbout_clicked),
- 			    NULL);
--	gtk_signal_connect (GTK_OBJECT (buttonClose), "clicked",
--			    GTK_SIGNAL_FUNC (on_buttonClose_clicked),
-+	g_signal_connect (G_OBJECT (buttonClose), "clicked",
-+			    G_CALLBACK (on_buttonClose_clicked),
- 			    NULL);
- 
- 	/* create our timer */
---- usbview-1.1/main.c	2008-06-25 23:03:27.000000000 +0200
-+++ usbview-1.1.new/main.c	2012-06-14 21:06:05.000523489 +0200
-@@ -30,7 +30,6 @@
- {
- 	GtkWidget *window1;
- 
--	gtk_set_locale ();
- 	gtk_init (&argc, &argv);
- 
- 	initialize_stuff();
---- usbview-1.1/usbparse.h	2008-06-25 23:03:47.000000000 +0200
-+++ usbview-1.1.new/usbparse.h	2012-06-14 21:06:05.000523489 +0200
-@@ -166,7 +166,7 @@
- 	struct Device	*child[MAX_CHILDREN];
- 	DeviceBandwidth	*bandwidth;
- 	GtkWidget	*tree;
--	GtkCTreeNode	*leaf;
-+	GtkTreeIter	leaf;
- } Device;
- 
- 
---- usbview-1.1/usbtree.c	2012-06-14 21:08:11.672516042 +0200
-+++ usbview-1.1.new/usbtree.c	2012-06-14 21:06:05.000523489 +0200
-@@ -45,7 +45,7 @@
- 
- 	/* blow away the tree if there is one */
- 	if (rootDevice != NULL) {
--		gtk_ctree_remove_node (GTK_CTREE(treeUSB), GTK_CTREE_NODE(rootDevice->leaf));
-+		gtk_tree_store_clear (treeStore);
- 	}
- 
- 	/* clean out the text box */
-@@ -208,32 +208,37 @@
- }
- 
- 
--void SelectItem (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer userData)
-+void SelectItem (GtkTreeSelection *selection, gpointer userData)
- {
--	int     data;
--	data = (int) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node);
--
--	PopulateListBox ((int)data);
--
--	return;
-+	GtkTreeIter iter;
-+	GtkTreeModel *model;
-+	gint deviceAddr;
-+
-+	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-+		gtk_tree_model_get (model, &iter,
-+				DEVICE_ADDR_COLUMN, &deviceAddr,
-+				-1);
-+		PopulateListBox (deviceAddr);
-+	}
- }
- 
- 
- static void DisplayDevice (Device *parent, Device *device)
- {
- 	int		i;
--	gchar		*text[1];
- 	int		configNum;
- 	int		interfaceNum;
- 	gboolean	driverAttached = TRUE;
-+	gint		deviceAddr;
-+	const gchar	*color = "black";
- 
- 	if (device == NULL)
- 		return;
- 
- 	/* build this node */
--	text[0] = device->name;
--	device->leaf = gtk_ctree_insert_node (GTK_CTREE(treeUSB), parent->leaf, NULL, text, 1, NULL, NULL, NULL, NULL, FALSE, FALSE);
--	gtk_ctree_node_set_row_data (GTK_CTREE(treeUSB), device->leaf, (gpointer)((device->deviceNumber<<8) | (device->busNumber)));
-+	deviceAddr = (device->deviceNumber << 8) | device->busNumber;
-+	gtk_tree_store_append (treeStore, &device->leaf,
-+			       (device->level != 0) ? &parent->leaf : NULL);
- 
- 	/* determine if this device has drivers attached to all interfaces */
- 	for (configNum = 0; configNum < MAX_CONFIGS; ++configNum) {
-@@ -252,15 +257,14 @@
- 	}
- 
- 	/* change the color of this leaf if there are no drivers attached to it */
--	if (driverAttached == FALSE) {
--		GdkColor        red;
--		 
--		red.red = 56000;
--		red.green = 0;
--		red.blue = 0;
--		red.pixel = 0;
--		gtk_ctree_node_set_foreground (GTK_CTREE(treeUSB), device->leaf, &red);
--	}
-+	if (driverAttached == FALSE)
-+		color = "red";
-+
-+	gtk_tree_store_set (treeStore, &device->leaf,
-+			    NAME_COLUMN, device->name,
-+			    DEVICE_ADDR_COLUMN, deviceAddr,
-+			    COLOR_COLUMN, color,
-+			    -1);
- 
- 	/* create all of the children's leafs */
- 	for (i = 0; i < MAX_CHILDREN; ++i) {
-@@ -283,11 +287,16 @@
- 
- static void FileError (void)
- {
--	gchar *tempString = g_malloc0(strlen (verifyMessage) + strlen (devicesFile) + 50);
--	sprintf (tempString, " Can not open the file %s \n\n%s", devicesFile, verifyMessage);
--	ShowMessage ("USBView Error", tempString, FALSE);
--	g_free (tempString);
--	return;
-+	GtkWidget *dialog;
-+
-+	dialog = gtk_message_dialog_new (
-+				    GTK_WINDOW (windowMain),
-+				    GTK_DIALOG_DESTROY_WITH_PARENT,
-+				    GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-+				    "Can not open the file %s\n\n%s",
-+				    devicesFile, verifyMessage);
-+	gtk_dialog_run (GTK_DIALOG (dialog));
-+	gtk_widget_destroy (dialog);
- }
- 
- 
-@@ -328,10 +337,6 @@
- 	int             finished;
- 	int             i;
- 
--	if (MessageShown() == TRUE) {
--		return;
--	}
--
- 	/* if refresh is selected, then always do a refresh, otherwise look at the file first */
- 	if (!refresh) {
- 		if (!FileHasChanged()) {
-@@ -368,11 +373,5 @@
- 	usb_name_devices ();
- 
--	/* set up our tree */
--	gtk_ctree_set_line_style (GTK_CTREE(treeUSB), GTK_CTREE_LINES_DOTTED);
--	gtk_ctree_set_expander_style (GTK_CTREE(treeUSB), GTK_CTREE_EXPANDER_SQUARE);
--	gtk_ctree_set_indent (GTK_CTREE(treeUSB),10);
--	gtk_clist_column_titles_passive (GTK_CLIST(treeUSB));
--
- 	/* build our tree */
- 	for (i = 0; i < rootDevice->maxChildren; ++i) {
- 		DisplayDevice (rootDevice, rootDevice->child[i]);
-@@ -380,11 +386,14 @@
- 
- 	gtk_widget_show (treeUSB);
- 
--	gtk_ctree_expand_recursive (GTK_CTREE(treeUSB), NULL);
-+	gtk_tree_view_expand_all (GTK_TREE_VIEW (treeUSB));
- 
- 	/* hook up our callback function to this tree if we haven't yet */
- 	if (!signal_connected) {
--		gtk_signal_connect (GTK_OBJECT (treeUSB), "tree-select-row", GTK_SIGNAL_FUNC (SelectItem), NULL);
-+		GtkTreeSelection *select;
-+		select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeUSB));
-+		g_signal_connect (G_OBJECT (select), "changed",
-+				  G_CALLBACK (SelectItem), NULL);
- 		signal_connected = TRUE;
- 	}
- 
---- usbview-1.1/usbtree.h	2008-06-25 23:03:52.000000000 +0200
-+++ usbview-1.1.new/usbtree.h	2012-06-14 21:06:05.000523489 +0200
-@@ -21,16 +21,24 @@
- #ifndef __USB_TREE_H
- #define __USB_TREE_H
- 
-+enum {
-+	NAME_COLUMN,
-+	DEVICE_ADDR_COLUMN,
-+	COLOR_COLUMN,
-+	N_COLUMNS
-+};
-+
- extern gchar		devicesFile[1000];
-+extern GtkTreeStore	*treeStore;
- extern GtkWidget	*treeUSB;
- extern GtkWidget	*textDescriptionView;
- extern GtkTextBuffer	*textDescriptionBuffer;
-+extern GtkWidget	*windowMain;
- 
- extern void	LoadUSBTree		(int refresh);
- extern void	initialize_stuff	(void);
- extern GtkWidget * create_windowMain	(void);
- extern void	configure_dialog	(void);
--extern void	about_dialog		(void);
- 
- extern void	on_buttonClose_clicked		(GtkButton *button, gpointer user_data);
- extern gboolean	on_window1_delete_event		(GtkWidget *widget, GdkEvent *event, gpointer user_data);
-@@ -39,8 +47,4 @@
- extern void	on_buttonAbout_clicked		(GtkButton *button, gpointer user_data);
- extern gint	on_timer_timeout		(gpointer user_data);
- 
--extern void	ShowMessage	(gchar *title, gchar *message, gboolean centered);
--extern gboolean	MessageShown	(void);
--
--
- #endif	/* __USB_TREE_H */
diff --git a/usbview-1.1-no-more-procbususb.patch b/usbview-1.1-no-more-procbususb.patch
deleted file mode 100644
index 8e03bc8..0000000
--- a/usbview-1.1-no-more-procbususb.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up usbview-1.1/usbtree.c~ usbview-1.1/usbtree.c
---- usbview-1.1/usbtree.c~	2009-03-11 02:40:28.000000000 +0100
-+++ usbview-1.1/usbtree.c	2012-06-14 16:37:15.512570539 +0200
-@@ -395,7 +395,7 @@ void LoadUSBTree (int refresh)
- 
- void initialize_stuff (void)
- {
--	strcpy (devicesFile, "/proc/bus/usb/devices");
-+	strcpy (devicesFile, "/sys/kernel/debug/usb/devices");
- 	memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile));
- 	previousChange = 0;
- 
-diff -up usbview-1.1/usbview.8~ usbview-1.1/usbview.8
---- usbview-1.1/usbview.8~	2009-03-11 02:48:48.000000000 +0100
-+++ usbview-1.1/usbview.8	2012-06-14 16:46:17.156538694 +0200
-@@ -15,7 +15,7 @@ No command line options are accepted by
- .B usbview.
- .SH FILES
- .TP
--.B /proc/bus/usb/devices
-+.B /sys/kernel/debug/usb/devices
- Kernel file providing information on USB devices attached to
- the machine.
- .SH SEE ALSO
diff --git a/usbview.spec b/usbview.spec
index 45504a7..426ea18 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,16 +1,15 @@
 Name:           usbview
-Version:        1.1
-Release:        10%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
 Source0:        http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
-Patch0:         usbview-1.1-no-more-procbususb.patch
-Patch1:         usbview-1.1-gtk3-port.patch
+Source2:        org.fedoraproject.usbview.policy
 BuildRequires:  gtk3-devel automake desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme polkit
 
 %description
 Display information about the topology of the devices connected to the USB bus
@@ -20,8 +19,7 @@ devices.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+# For aarch64 support
 autoreconf -f -i
 # Convert to utf-8
 for file in ChangeLog; do
@@ -39,12 +37,25 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#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
 --add-category="System"                                 \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
 %{SOURCE1}
@@ -65,13 +76,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %doc ChangeLog COPYING* README TODO
-%{_bindir}/usbview
+%{_bindir}/usbview*
 %{_mandir}/man8/usbview*
+%{_datadir}/polkit-1/actions/org.fedoraproject.usbview.policy
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.xpm
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 
 
 %changelog
+* Sat Apr  6 2013 Hans de Goede <hdegoede@redhat.com> - 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 <paragn AT fedoraproject DOT org> - 1.1-10
 - Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
 

From 473a7d7df7670dcdedcc15853d64b3fe57df9def Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 6 Apr 2013 20:31:04 +0200
Subject: [PATCH 08/45] 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.
---
 .gitignore | 1 +
 sources    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4e73b37..230d91a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 usbview-1.1.tar.gz
+/usbview-2.0.tar.gz
diff --git a/sources b/sources
index e69de29..a0e6311 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+565f2e79f3924d14ab5b4d8aced557e5  usbview-2.0.tar.gz

From 90a8ed2d592fb0c7b70d1b85204a1f51d35a6655 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 10 May 2013 10:53:41 +0200
Subject: [PATCH 09/45] 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
---
 usbview.desktop |  1 -
 usbview.spec    | 13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/usbview.desktop b/usbview.desktop
index 6f31b8a..1797832 100644
--- a/usbview.desktop
+++ b/usbview.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=USB Viewer
-GenericName=USB Viewer
 Comment=USB topology and device viewer
 Exec=usbview
 Icon=usbview
diff --git a/usbview.spec b/usbview.spec
index 426ea18..bd01e45 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -8,7 +8,7 @@ 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:  gtk3-devel automake desktop-file-utils
+BuildRequires:  gtk3-devel desktop-file-utils
 Requires:       hicolor-icon-theme polkit
 
 %description
@@ -19,8 +19,6 @@ devices.
 
 %prep
 %setup -q
-# For aarch64 support
-autoreconf -f -i
 # Convert to utf-8
 for file in ChangeLog; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
@@ -35,7 +33,7 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 #setup pkxexec
 mv $RPM_BUILD_ROOT%{_bindir}/usbview $RPM_BUILD_ROOT%{_bindir}/usbview.bin
@@ -56,7 +54,6 @@ desktop-file-install                                    \
 %if 0%{?fedora} && 0%{?fedora} < 19
 --vendor fedora                                         \
 %endif
---add-category="System"                                 \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
 %{SOURCE1}
 
@@ -84,6 +81,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri May 10 2013 Hans de Goede <hdegoede@redhat.com> - 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 <hdegoede@redhat.com> - 2.0-1
 - New upstream release 2.0
 - Drop patches (all upstreamed)

From b4c8d0ece97ec6de2f24924b285242201d9a5f6a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 00:48:51 -0500
Subject: [PATCH 10/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index bd01e45..6b748b0 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri May 10 2013 Hans de Goede <hdegoede@redhat.com> - 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

From f72b9ebb85f5e125c3b6019ce5841a397957d0d8 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 22:05:42 -0500
Subject: [PATCH 11/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 6b748b0..b0b3fc5 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From e5bc8ac7e2fdbb69c097d7179e038c6b754160bc Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 07:16:34 +0000
Subject: [PATCH 12/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index b0b3fc5..d9d2af8 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 3cc4136a5c58cf87e55b18b88de066184bac988d Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 01:42:44 +0000
Subject: [PATCH 13/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index d9d2af8..92f8061 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From a6c79b5d80c9cfe6e7175f43a3b981d6bb82fb49 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 02:28:05 +0000
Subject: [PATCH 14/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 92f8061..e801806 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From ddefd066eb9f09c4915dbe41624df42d1822f1b8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 16:50:49 +0000
Subject: [PATCH 15/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index e801806..59326a2 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 3362ca6cbc1106d69a793991ee17092a5cc6d407 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 21:05:57 +0000
Subject: [PATCH 16/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 59326a2..2457a1c 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From e12313252ce7a5d675af3ddae7400a829b3cbc8a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 09:54:30 +0000
Subject: [PATCH 17/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 2457a1c..8dfc791 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From d041f5d27b14a254211808827fae747566af0fe2 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Thu, 18 Jan 2018 22:43:29 +0100
Subject: [PATCH 18/45] Remove obsolete scriptlets

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 usbview.spec | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/usbview.spec b/usbview.spec
index 8dfc791..3fd22f6 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -57,20 +57,6 @@ desktop-file-install                                    \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
 %{SOURCE1}
 
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
 %files
 %doc ChangeLog COPYING* README TODO
 %{_bindir}/usbview*
@@ -81,6 +67,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0-11
+- Remove obsolete scriptlets
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From 3c9bf00eab172467ff5e42a9a93c08529a66b768 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 20:11:50 +0000
Subject: [PATCH 19/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 3fd22f6..7225c4d 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -67,6 +67,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0-11
 - Remove obsolete scriptlets
 

From 0e1a36e84d7dde83bc47e298779d267858a3a1b7 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Mon, 9 Jul 2018 19:06:53 +0200
Subject: [PATCH 20/45] add BuildRequires: gcc

Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
---
 usbview.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usbview.spec b/usbview.spec
index 7225c4d..3874efd 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -8,6 +8,7 @@ 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:  gcc
 BuildRequires:  gtk3-devel desktop-file-utils
 Requires:       hicolor-icon-theme polkit
 

From c4a6a9afb8a06e5de592312955d28fffb7a41fdb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 08:20:40 +0000
Subject: [PATCH 21/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 3874efd..5a4df09 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        USB topology and device viewer
 Group:          Applications/System
 License:        GPLv2
@@ -68,6 +68,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 9f1827101e921b1ae5975acf0b7fca2b1588e6e5 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:29 +0100
Subject: [PATCH 22/45] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 usbview.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 5a4df09..bd73c51 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -2,7 +2,6 @@ Name:           usbview
 Version:        2.0
 Release:        13%{?dist}
 Summary:        USB topology and device viewer
-Group:          Applications/System
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
 Source0:        http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz

From a8d7e6e3d1e25d45bf74a7750952cd0da0557d4d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 10:58:25 +0000
Subject: [PATCH 23/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index bd73c51..90bab01 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -67,6 +67,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From d420e427248c936dc3b88b14f2f2df7277bab497 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 02:40:35 +0000
Subject: [PATCH 24/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 90bab01..280a7ea 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -67,6 +67,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* 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
 

From 3c0c110079192df8f43bfddfbe7be5e6d5294b04 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 02:48:20 +0000
Subject: [PATCH 25/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 280a7ea..f5610b5 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -67,6 +67,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* 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
 

From 661338caef5efcaf8016b0a379fae7ca94df0dc7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 13:26:56 +0000
Subject: [PATCH 26/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index f5610b5..59725c9 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -67,6 +67,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* 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
 

From a05160d700254f7c5d19f03dd6881f7a12952f03 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Sat, 9 Jan 2021 00:30:33 +0000
Subject: [PATCH 27/45] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 usbview.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usbview.spec b/usbview.spec
index 59725c9..cd5045e 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -7,6 +7,7 @@ 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: make
 BuildRequires:  gcc
 BuildRequires:  gtk3-devel desktop-file-utils
 Requires:       hicolor-icon-theme polkit

From 369f7ddc159e51f69f28bfb840d78cbad0769dd5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 22:48:51 +0000
Subject: [PATCH 28/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index cd5045e..0426241 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -68,6 +68,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* 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
 

From 5f6f414eb4880c996a5f8907a184e0270bcf666b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 20:11:53 +0000
Subject: [PATCH 29/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 0426241..70ab32a 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -68,6 +68,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* 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
 

From 68b7734215a2c9f993431a21a4041e89246c4a35 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 03:41:03 +0000
Subject: [PATCH 30/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 70ab32a..8904a54 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        2.0
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -68,6 +68,9 @@ desktop-file-install                                    \
 
 
 %changelog
+* 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
 

From 7d88803c7ae790fc018c07440b195dd74abeee8b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 22 Jan 2022 09:46:59 +0000
Subject: [PATCH 31/45] Update to 2.2 (fixes (CVE-2022-23220)

---
 .gitignore                       |  1 +
 org.fedoraproject.usbview.policy | 37 -------------------
 sources                          |  2 +-
 usbview.desktop                  |  8 -----
 usbview.spec                     | 62 +++++++++++---------------------
 5 files changed, 22 insertions(+), 88 deletions(-)
 delete mode 100644 org.fedoraproject.usbview.policy
 delete mode 100644 usbview.desktop

diff --git a/.gitignore b/.gitignore
index 230d91a..02f6c04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 usbview-1.1.tar.gz
 /usbview-2.0.tar.gz
+/usbview-2.2.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 @@
-<?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>
diff --git a/sources b/sources
index a0e6311..0a7de57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-565f2e79f3924d14ab5b4d8aced557e5  usbview-2.0.tar.gz
+SHA512 (usbview-2.2.tar.gz) = 07684667310a9e073de05d4cb14a56370e72d4c1a2a81038331d7e0f5a546c65cb0cacedc6117702c116bb5863551f6ae730b4a9e6313d45fb052c9ce7823d16
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 8904a54..1e53dc0 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,16 +1,18 @@
 Name:           usbview
-Version:        2.0
-Release:        20%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 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: make
+
+BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
-BuildRequires:  gtk3-devel desktop-file-utils
-Requires:       hicolor-icon-theme polkit
+BuildRequires:  gtk3-devel
+BuildRequires:  ImageMagick
+BuildRequires:  make
+Requires:       hicolor-icon-theme
+Requires:       polkit
 
 %description
 Display information about the topology of the devices connected to the USB bus
@@ -19,55 +21,31 @@ 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}
-
 %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}/polkit-1/actions/org.freedesktop.pkexec.usbview.policy
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/*%{name}.desktop
 
 
 %changelog
+* 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
 

From 8145f32f343106e3d6d063de457024f5a09bfd1d Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 22 Jan 2022 10:01:22 +0000
Subject: [PATCH 32/45] cleanup gitignore

---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 02f6c04..564b1cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-usbview-1.1.tar.gz
-/usbview-2.0.tar.gz
-/usbview-2.2.tar.gz
+/usbview-*.tar.gz

From 38a69e069b0fb9c3a6eb776d09e96f16776ebff3 Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Sat, 22 Jan 2022 12:49:37 -0500
Subject: [PATCH 33/45] New 3.0 release

---
 sources      | 2 +-
 usbview.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 0a7de57..0acfb85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (usbview-2.2.tar.gz) = 07684667310a9e073de05d4cb14a56370e72d4c1a2a81038331d7e0f5a546c65cb0cacedc6117702c116bb5863551f6ae730b4a9e6313d45fb052c9ce7823d16
+SHA512 (usbview-3.0.tar.gz) = 65cfc933eac44e83df48ebc79e9eb85db64f817b9c09b708ba06471d7845ac575cdec1a4a06a5792cb2b8d80b046dadc118200c455a350300b0285b80221aac5
diff --git a/usbview.spec b/usbview.spec
index 1e53dc0..de25ff9 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,5 +1,5 @@
 Name:           usbview
-Version:        2.2
+Version:        3.0
 Release:        1%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
@@ -40,6 +40,9 @@ devices.
 
 
 %changelog
+* 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

From 2fe4f97ed0be77b6a35b81c8350e6ba5d1e9b330 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 11:34:03 +0000
Subject: [PATCH 34/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index de25ff9..49c69ed 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -40,6 +40,9 @@ devices.
 
 
 %changelog
+* 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
 

From b55cdc763c1b56e2bbf081f8fa3730d7debd614f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 05:59:29 +0000
Subject: [PATCH 35/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 49c69ed..0085edf 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        USB topology and device viewer
 License:        GPLv2
 URL:            http://www.kroah.com/linux-usb/
@@ -40,6 +40,9 @@ devices.
 
 
 %changelog
+* 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
 

From 01272d877b07aff94896fb545d693dce3d6bbc82 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Wed, 1 Feb 2023 12:47:46 +0100
Subject: [PATCH 36/45] Change license string to the SPDX format required by
 Fedora

---
 usbview.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 0085edf..c976687 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -2,7 +2,7 @@ Name:           usbview
 Version:        3.0
 Release:        3%{?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
 

From 6108b7b465a260db06028765b160f282de4b4b0d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 17:17:47 +0000
Subject: [PATCH 37/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index c976687..da6c3c1 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -40,6 +40,9 @@ devices.
 
 
 %changelog
+* 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
 

From 68fb2353b3582220ab235b0107ecd14666036902 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 24 Oct 2023 08:05:19 +0200
Subject: [PATCH 38/45] New upstream release 3.1

---
 sources      |  2 +-
 usbview.spec | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sources b/sources
index 0acfb85..9dd2bc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (usbview-3.0.tar.gz) = 65cfc933eac44e83df48ebc79e9eb85db64f817b9c09b708ba06471d7845ac575cdec1a4a06a5792cb2b8d80b046dadc118200c455a350300b0285b80221aac5
+SHA512 (usbview-3.1.tar.gz) = edc60d9543e5ebb377d4d1e71b8ca83d055cee9c12270a4d189a19503c12c8574103637fd6b9a13741c6dc9375a80c7c57daf4d6ccf0520d55e843e07be09479
diff --git a/usbview.spec b/usbview.spec
index da6c3c1..c3a7b85 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
-Version:        3.0
-Release:        4%{?dist}
+Version:        3.1
+Release:        1%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -11,6 +11,7 @@ BuildRequires:  gcc
 BuildRequires:  gtk3-devel
 BuildRequires:  ImageMagick
 BuildRequires:  make
+BuildRequires:  libappstream-glib
 Requires:       hicolor-icon-theme
 Requires:       polkit
 
@@ -30,16 +31,21 @@ devices.
 %install
 %make_install
 
+appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usbview.metainfo.xml
+
 %files
 %license LICENSES/GPL-2.0-only.txt
 %{_bindir}/usbview*
 %{_mandir}/man8/usbview*
-%{_datadir}/polkit-1/actions/org.freedesktop.pkexec.usbview.policy
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/*%{name}.desktop
+%{_metainfodir}/com.kroah.usbview.metainfo.xml
 
 
 %changelog
+* 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
 

From bd14ad171c87f40b789e137596194195e5d299a9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 07:19:20 +0000
Subject: [PATCH 39/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index c3a7b85..8180915 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -43,6 +43,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usb
 
 
 %changelog
+* 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
 

From 54653de864f6a6b9396f59be5481bcfa9af7213d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 08:26:25 +0000
Subject: [PATCH 40/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 8180915..b77a974 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -43,6 +43,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usb
 
 
 %changelog
+* 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
 

From 83452efc1233575b99698eda76788b068cb60d37 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Tue, 24 Dec 2024 17:54:27 -0500
Subject: [PATCH 41/45] Update dependencies

polkit/pkexec are no longer used as of 3.1:

https://github.com/gregkh/usbview/commit/8f911eb0440fd93eda85ab5a99764a34dcf91fc4

Also, the GdkPixbuf loader for XPM is now in a separate package as of
Fedora 41 and RHEL/EPEL 10.
---
 usbview.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/usbview.spec b/usbview.spec
index b77a974..e301bf3 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -12,8 +12,10 @@ 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
-Requires:       polkit
 
 %description
 Display information about the topology of the devices connected to the USB bus
@@ -43,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usb
 
 
 %changelog
+* 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
 

From 046314196314b7121fd6b5cb1f29c6acaab626bf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 13:57:47 +0000
Subject: [PATCH 42/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index e301bf3..c269ed1 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -45,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usb
 
 
 %changelog
+* 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
 

From fb58b9ae54624ec3cf70bc304b41be824f2f1716 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 19:53:16 +0000
Subject: [PATCH 43/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index c269ed1..918ac57 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -45,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usb
 
 
 %changelog
+* 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
 

From 3808cebb38bdda67f500336c6b3164a4fc503c0b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 19:42:26 +0000
Subject: [PATCH 44/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 918ac57..0262495 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -45,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usb
 
 
 %changelog
+* 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
 

From 4401164f2e4a1de2b817961f8eb3b14ddd83c403 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 08:17:02 +0000
Subject: [PATCH 45/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 usbview.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usbview.spec b/usbview.spec
index 0262495..4ce8f6d 100644
--- a/usbview.spec
+++ b/usbview.spec
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        USB topology and device viewer
 License:        GPL-2.0-only
 URL:            http://www.kroah.com/linux-usb/
@@ -45,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.kroah.usb
 
 
 %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