diff --git a/.gitignore b/.gitignore index c28da58..91bf858 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ setroubleshoot-2.2.93.tar.gz /setroubleshoot-3.3.34.tar.gz /setroubleshoot-3.3.35.tar.gz /setroubleshoot-3.3.36.tar.gz +/setroubleshoot-3.3.37.tar.gz diff --git a/0001-browser-Always-show-Report-Bug-button.patch b/0001-browser-Always-show-Report-Bug-button.patch deleted file mode 100644 index 346e8b2..0000000 --- a/0001-browser-Always-show-Report-Bug-button.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fb4a884fe6266e664cc886273bad3b2ae761118a Mon Sep 17 00:00:00 2001 -From: Vit Mojzis -Date: Thu, 11 Dec 2025 13:50:45 +0100 -Subject: [PATCH] browser: Always show "Report Bug" button - -Without python3-libreport the "Report Bug" button was not shown at all. -After this change the button is always visible, but without libreport it -is disabled and the tooltip tells the user how to enable it. - -Signed-off-by: Vit Mojzis ---- - src/setroubleshoot/browser.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/setroubleshoot/browser.py b/src/setroubleshoot/browser.py -index 73fc26e..47788a7 100644 ---- a/src/setroubleshoot/browser.py -+++ b/src/setroubleshoot/browser.py -@@ -548,11 +548,15 @@ class BrowserApplet: - report_button.connect("clicked", self.fix_bug, alert.local_id, plugin.analysis_id) - vbox.add(report_button) - -- elif plugin.report_bug and has_libreport: -+ elif plugin.report_bug: - report_button = Gtk.Button() - report_button.set_label(_("Report\nBug")) - report_button.show() -- report_button.connect("clicked", self.report_bug, alert) -+ if has_libreport: -+ report_button.connect("clicked", self.report_bug, alert) -+ else: -+ report_button.set_sensitive(False) -+ report_button.set_tooltip_text(_("Please install python3-libreport to enable bug reporting.")) - vbox.add(report_button) - - vbox.set_sensitive(highlight) --- -2.52.0 - diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 28e0bbe..f245031 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -5,16 +5,15 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 3.3.36 +Version: 3.3.37 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://gitlab.com/setroubleshoot/setroubleshoot -Source0: https://gitlab.com/-/project/24478376/uploads/51a9cda747130f92860720841a7fd9c9/setroubleshoot-3.3.36.tar.gz +Source0: https://gitlab.com/-/project/24478376/uploads/cbdfc2a87b350583c32b168fd9aad9fd/setroubleshoot-3.3.37.tar.gz Source1: %{name}.tmpfiles Source2: %{name}.sysusers -# git format-patch -N 3.3.36 +# git format-patch -N 3.3.37 # for j in 00*patch; do printf "Patch: %s\n" $j; done -Patch: 0001-browser-Always-show-Report-Bug-button.patch BuildRequires: gcc BuildRequires: make BuildRequires: libcap-ng-devel @@ -95,7 +94,7 @@ install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysusersdir}/%{name}.conf %package server Summary: SELinux troubleshoot server -Requires: %{name}-plugins >= 3.3.10 +Requires: %{name}-plugins >= 3.3.15 Requires: audit >= 3.0.1 Requires: audit-libs-python3 Requires: libxml2-python3 @@ -195,6 +194,11 @@ to user preference. The same tools can be run on existing log files. %doc AUTHORS COPYING ChangeLog DBUS.md NEWS README TODO %changelog +* Thu May 07 2026 Vit Mojzis - 3.3.37-1 +- Migrate from libxml2 to xml.etree.ElementTree +- Handle ImportError when setroubleshoot.browser is not available +- Add support for multiple commands in fix_cmd (RHEL-155209) + * Mon Dec 15 2025 Vit Mojzis - 3.3.36-1 - Rename appdata to metainfo - Replace python-six with python 3 only code diff --git a/sources b/sources index e88edea..6718e7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setroubleshoot-3.3.36.tar.gz) = 089583970169d4127cf825d8660dc755cb154771b8e48f6b7558f8fa090491ad6ac492f435a8f410c73c46ab1500a203f4123fcda69b1cd7adbf792b5580cb83 +SHA512 (setroubleshoot-3.3.37.tar.gz) = 8b67b28c2e2d2f766c00723f2a67e82fc43079a9a5868c4598f80331bb12ae0e94749cd68fedc718462ae9203e5b9d363033902c699f597a79865d6d31df61cd