rpms/setroubleshoot
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild with patches added to specfile

Browse Source 
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
This commit is contained in:
Petr Lautrbach 2024-06-11 10:59:39 +02:00
parent 7267f0a7a0
commit bc656326cc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setroubleshoot.spec
View File

@ -4,7 +4,7 @@
Summary: Helps troubleshoot SELinux problems Summary: Helps troubleshoot SELinux problems
Name: setroubleshoot Name: setroubleshoot
Version: 3.3.33 Version: 3.3.33
Release: 2%{?dist} Release: 2.1%{?dist}
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://gitlab.com/setroubleshoot/setroubleshoot URL: https://gitlab.com/setroubleshoot/setroubleshoot
Source0: https://gitlab.com/setroubleshoot/setroubleshoot/-/archive/%{version}/setroubleshoot-%{version}.tar.gz Source0: https://gitlab.com/setroubleshoot/setroubleshoot/-/archive/%{version}/setroubleshoot-%{version}.tar.gz
@ -12,6 +12,8 @@ Source1: %{name}.tmpfiles
Source2: %{name}.sysusers Source2: %{name}.sysusers
# git format-patch -N 3.3.33 # 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 # 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: gcc
BuildRequires: make BuildRequires: make
BuildRequires: libcap-ng-devel BuildRequires: libcap-ng-devel
@ -21,6 +23,7 @@ BuildRequires: audit-libs-devel >= 3.0.1
BuildRequires: python3-libselinux python3-dasbus python3-gobject gtk3-devel BuildRequires: python3-libselinux python3-dasbus python3-gobject gtk3-devel
# for the _tmpfilesdir macro # for the _tmpfilesdir macro
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: git-core
Requires: %{name}-server = %{version}-%{release} Requires: %{name}-server = %{version}-%{release}
Requires: gtk3, libnotify Requires: gtk3, libnotify
Requires: libreport-gtk >= 2.2.1-2, python3-libreport 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 %prep
%autosetup -p 1 %autosetup -p 1 -S git
%build %build
./autogen.sh ./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 %doc AUTHORS COPYING ChangeLog DBUS.md NEWS README TODO
%changelog %changelog
* Mon Jun 03 2024 Petr Lautrbach <lautrbach@redhat.com> - 3.3.33-2 * Tue Jun 11 2024 Petr Lautrbach <lautrbach@redhat.com> - 3.3.33-2.1
- Ship with contemporary app icon - Ship with contemporary app icon
* Wed Jan 31 2024 Vit Mojzis <vmojzis@redhat.com> - 3.3.33-1 * Wed Jan 31 2024 Vit Mojzis <vmojzis@redhat.com> - 3.3.33-1