From 458e33d050a9fdb0ac6aeda5cb46b55a2377a691 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 9 Oct 2025 11:57:36 +0800 Subject: [PATCH] drop useless requires on fros --- ...port-for-avoid-conflict-with-k8s-in-.patch | 39 +++++++++++++++++++ libreport.spec | 14 ++++++- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch diff --git a/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch b/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch new file mode 100644 index 0000000..03f0dac --- /dev/null +++ b/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch @@ -0,0 +1,39 @@ +From 90a2c95e52ca8c38cab5a28b969e93262c3642dd Mon Sep 17 00:00:00 2001 +From: caixiaomeng 00662745 +Date: Tue, 28 May 2024 19:35:40 +0800 +Subject: [PATCH] modify testcase port for avoid conflict with k8s in 8080 + +--- + tests/mock_bugzilla_server/mock_bugzilla_server.py | 2 +- + tests/rhbz_functions.at | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/mock_bugzilla_server/mock_bugzilla_server.py b/tests/mock_bugzilla_server/mock_bugzilla_server.py +index 14d1582..5e84e9c 100755 +--- a/tests/mock_bugzilla_server/mock_bugzilla_server.py ++++ b/tests/mock_bugzilla_server/mock_bugzilla_server.py +@@ -75,7 +75,7 @@ def populate_struct(dest: dict, src: dict, keys: List[str]): + except KeyError: + pass + +-with MyXMLRPCServer(('', 8080), requestHandler=RequestHandler) as server: ++with MyXMLRPCServer(('', 9137), requestHandler=RequestHandler) as server: + class Bug: + @staticmethod + @server.register_function(name='Bug.create') +diff --git a/tests/rhbz_functions.at b/tests/rhbz_functions.at +index 3e504d0..978336e 100644 +--- a/tests/rhbz_functions.at ++++ b/tests/rhbz_functions.at +@@ -81,7 +81,7 @@ TS_MAIN + sleep(3); + + struct bugzilla_struct rhbz = { 0 }; +- rhbz.b_bugzilla_url = "http://localhost:8080/"; ++ rhbz.b_bugzilla_url = "http://localhost:9137/"; + rhbz.b_bugzilla_xmlrpc = g_build_filename(rhbz.b_bugzilla_url, "xmlrpc.cgi", NULL); + rhbz.b_ssl_verify = FALSE; + +-- +2.33.0 + diff --git a/libreport.spec b/libreport.spec index 3d889e6..7dee986 100644 --- a/libreport.spec +++ b/libreport.spec @@ -2,13 +2,14 @@ Name: libreport Version: 2.15.2 -Release: 4 +Release: 6 License: GPLv2+ Summary: Generic library for reporting various problems URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch9000: fix-bug-delete-gtk-deprecation-warnings.patch +Patch9001: huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch BuildRequires: dbus-devel gtk3-devel curl-devel desktop-file-utils python3-devel BuildRequires: gettext libxml2-devel libtar-devel intltool libtool texinfo asciidoc xmlto @@ -87,7 +88,6 @@ bugs Summary: GTK front-end for libreport Requires: libreport = %{version}-%{release} Requires: libreport-plugin-reportuploader = %{version}-%{release} -Requires: fros >= 1.0 Provides: report-gtk = 0:0.23-1 Obsoletes: report-gtk < 0:0.23-1 @@ -148,6 +148,7 @@ data over ftp/scp... %autosetup -n %{name}-%{version} -p1 %build +./gen-version ./autogen.sh CFLAGS="%{optflags}" @@ -335,6 +336,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Oct 04 2025 Funda Wang - 2.15.2-6 +- drop useless requires on fros + +* Tue May 28 2024 caixiaomeng - 2.15.2-5 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:modify testcase port for avoid conflict with k8s in 8080 + * Fri Apr 28 2023 zhoupengcheng - 2.15.2-4 - Type:bugfix - CVE:NA -- Gitee