!12 Update to 1.4.1

From: @starlet-dx 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-10-31 07:07:13 +00:00 committed by Gitee
commit 3c0dcaa8a4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 7 additions and 50 deletions

View File

@ -1,45 +0,0 @@
From 874c746852c1922fbcc3c6bcb107cbfc30a14cc6 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Mon, 20 Jul 2020 06:37:55 +0200
Subject: [PATCH] Fix Python module installation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Currently, all sources are installed as “pure”, which does not apply to
the wrapper module. Moreover, Meson previously defaulted to “false” for
the “pure” kwarg, which was subsequently fixed. Both of these issues
make the RPM package unbuildable, which can be fixed by making all
sources unpure (they all share the same module name, so its either this
or renaming the wrapper module to avoid import conflicts).
https://github.com/mesonbuild/meson/commit/efb86088bcf89
---
src/gnome_abrt/meson.build | 1 +
src/gnome_abrt/wrappers/meson.build | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/gnome_abrt/meson.build b/src/gnome_abrt/meson.build
index 88489b5..f1844b9 100644
--- a/src/gnome_abrt/meson.build
+++ b/src/gnome_abrt/meson.build
@@ -42,6 +42,7 @@ foreach file: gnome_abrt_sources
endforeach
python_installation.install_sources(gnome_abrt_generated_sources + gnome_abrt_sources,
+ pure: false,
subdir: 'gnome_abrt',
)
diff --git a/src/gnome_abrt/wrappers/meson.build b/src/gnome_abrt/wrappers/meson.build
index 412b0e2..a185bf1 100644
--- a/src/gnome_abrt/wrappers/meson.build
+++ b/src/gnome_abrt/wrappers/meson.build
@@ -11,6 +11,7 @@ foreach file: gnome_abrt_wrappers_sources
endforeach
python_installation.install_sources(gnome_abrt_wrappers_sources,
+ pure: false,
subdir: 'gnome_abrt/wrappers',
)

Binary file not shown.

BIN
gnome-abrt-1.4.1.tar.gz Normal file

Binary file not shown.

View File

@ -1,8 +1,8 @@
%global commit 3e3512d2d6c81a4ca9b3b4d3f3936c876a6482f7
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: gnome-abrt
Version: 1.3.5
Release: 3
Version: 1.4.1
Release: 1
Summary: A utility for viewing problems that have occurred with the system
License: GPLv2+
URL: https://github.com/abrt/gnome-abrt
@ -11,8 +11,7 @@ Source0: %{url}/archive/%{commit}.tar.gz#/gnome-abrt-%{commit}.tar.g
%else
Source0: %{url}/archive/%{version}/gnome-abrt-%{version}.tar.gz
%endif
Patch0001: Fix-Python-module-installation.patch
BuildRequires: git-core meson gettext libtool python3-devel desktop-file-utils asciidoc xmlto
BuildRequires: meson gettext libtool python3-devel desktop-file-utils asciidoc xmlto
BuildRequires: pygobject3-devel libreport-gtk-devel > 2.4.0 python3-libreport
BuildRequires: abrt-gui-devel > 2.4.0 gtk3-devel
BuildRequires: python3-pylint python3-six python3-inotify python3-gobject python3-dbus
@ -24,7 +23,7 @@ A GNOME application allows users to browse through detected problems and
provides them with convenient way for managing these problems.
%prep
%autosetup -S git %{?snapshot:-n gnome-abrt%-%{commit}}
%autosetup %{?snapshot:-n gnome-abrt%-%{commit}} -p1
%build
%meson \
@ -50,6 +49,9 @@ provides them with convenient way for managing these problems.
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Sat Oct 29 2022 yaoxin <yaoxin30@h-partners.com> - 1.4.1-1
- update to 1.4.1
* Thu Jul 1 2021 lingsheng <lingsheng@huawei.com> - 1.3.5-3
- Fix Python module installation