From bc656326cca2f55a8581a85af42daf46efdd097c Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Tue, 11 Jun 2024 10:59:39 +0200 Subject: [PATCH] Rebuild with patches added to specfile Also use %autosetup -S git Fixes: + /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch -f File gui/16x16/setroubleshoot_icon.png: git binary diffs are not supported. File gui/16x16/setroubleshoot_red_icon.png: git binary diffs are not supported. Resolves: RHEL-39987 --- setroubleshoot.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 4b5a39f..5bc043f 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -4,7 +4,7 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot Version: 3.3.33 -Release: 2%{?dist} +Release: 2.1%{?dist} License: GPL-2.0-or-later URL: https://gitlab.com/setroubleshoot/setroubleshoot Source0: https://gitlab.com/setroubleshoot/setroubleshoot/-/archive/%{version}/setroubleshoot-%{version}.tar.gz @@ -12,6 +12,8 @@ Source1: %{name}.tmpfiles Source2: %{name}.sysusers # git format-patch -N 3.3.33 # i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done +Patch0001: 0001-gitlab-ci-fix-Fedora-and-Debian-build-requirements.patch +Patch0002: 0002-data-update-app-icon.patch BuildRequires: gcc BuildRequires: make BuildRequires: libcap-ng-devel @@ -21,6 +23,7 @@ BuildRequires: audit-libs-devel >= 3.0.1 BuildRequires: python3-libselinux python3-dasbus python3-gobject gtk3-devel # for the _tmpfilesdir macro BuildRequires: systemd-rpm-macros +BuildRequires: git-core Requires: %{name}-server = %{version}-%{release} Requires: gtk3, libnotify Requires: libreport-gtk >= 2.2.1-2, python3-libreport @@ -65,7 +68,7 @@ to user preference. The same tools can be run on existing log files. %prep -%autosetup -p 1 +%autosetup -p 1 -S git %build ./autogen.sh @@ -191,7 +194,7 @@ to user preference. The same tools can be run on existing log files. %doc AUTHORS COPYING ChangeLog DBUS.md NEWS README TODO %changelog -* Mon Jun 03 2024 Petr Lautrbach - 3.3.33-2 +* Tue Jun 11 2024 Petr Lautrbach - 3.3.33-2.1 - Ship with contemporary app icon * Wed Jan 31 2024 Vit Mojzis - 3.3.33-1