diff --git a/.gitignore b/.gitignore index 56386dd..24df3b8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,13 +21,3 @@ /libreport-2.17.2.tar.gz /libreport-2.17.3.tar.gz /libreport-2.17.4.tar.gz -/libreport-2.17.5.tar.gz -/libreport-2.17.6.tar.gz -/libreport-2.17.7.tar.gz -/libreport-2.17.8.tar.gz -/libreport-2.17.9.tar.gz -/libreport-2.17.10.tar.gz -/libreport-2.17.11.tar.gz -/libreport-2.17.13.tar.gz -/libreport-2.17.14.tar.gz -/libreport-2.17.15.tar.gz diff --git a/.packit.yml b/.packit.yml index 115dab4..b82be50 100644 --- a/.packit.yml +++ b/.packit.yml @@ -1,14 +1,10 @@ specfile_path: libreport.spec synced_files: -- .packit.yml -- libreport.spec + - .packit.yml + - libreport.spec upstream_package_name: libreport upstream_project_url: https://github.com/abrt/libreport downstream_package_name: libreport - -# No extra dependencies are necessary to build the SRPM. -srpm_build_deps: [] - jobs: - job: propose_downstream trigger: release diff --git a/801.patch b/801.patch deleted file mode 100644 index 8f784ff..0000000 --- a/801.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9be0010e109d307921a049d10078813423227582 Mon Sep 17 00:00:00 2001 -From: Nicolas Iooss -Date: Fri, 15 Dec 2023 18:03:33 +0100 -Subject: [PATCH] Fix compatibility with libxml2 2.12 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since libxml2 2.12, xmlNodePtr is no longer included by libxml/encoding.h. -This leads to build errors such as: - - CC reporter_mantisbt-reporter-mantisbt.o - In file included from reporter-mantisbt.c:22: - mantisbt.h:48:5: error: unknown type name ‘xmlNodePtr’ - 48 | xmlNodePtr sr_root; - | ^~~~~~~~~~ - mantisbt.h:49:5: error: unknown type name ‘xmlNodePtr’ - 49 | xmlNodePtr sr_body; - | ^~~~~~~~~~ - mantisbt.h:50:5: error: unknown type name ‘xmlNodePtr’ - 50 | xmlNodePtr sr_method; - | ^~~~~~~~~~ - -Fix this by including libxml/tree.h. - -Signed-off-by: Nicolas Iooss ---- - src/plugins/mantisbt.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/plugins/mantisbt.h b/src/plugins/mantisbt.h -index 1feaf8f88..6979e7244 100644 ---- a/src/plugins/mantisbt.h -+++ b/src/plugins/mantisbt.h -@@ -25,6 +25,7 @@ extern "C" { - #endif - - #include -+#include - #include "problem_report.h" - - #define SOAP_STRING "ns2:string" diff --git a/README.packit b/README.packit index f592284..0070ced 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. +The file was generated using packit 0.59.1.dev24+g41a74ae. diff --git a/libreport-c89-2.patch b/libreport-c89-2.patch deleted file mode 100644 index 7b9b9d6..0000000 --- a/libreport-c89-2.patch +++ /dev/null @@ -1,46 +0,0 @@ -problem_item_get_size expects unsigned long * argument in problem_data.at test - -Otherwise, the test fails to build on i686 with GCC 14. - -Submitted upstream: - -diff --git a/tests/problem_data.at b/tests/problem_data.at -index 4d8bf0075c0a8b91..db67a76732d48663 100644 ---- a/tests/problem_data.at -+++ b/tests/problem_data.at -@@ -89,7 +89,7 @@ int main(int argc, char **argv) - struct problem_item *itm = problem_data_add_ext(data, "1", "foo", CD_FLAG_TXT | CD_FLAG_ISNOTEDITABLE, PROBLEM_ITEM_UNINITIALIZED_SIZE); - const size_t old_size = strlen(itm->content); - { -- size_t current_size = PROBLEM_ITEM_UNINITIALIZED_SIZE; -+ unsigned long current_size = PROBLEM_ITEM_UNINITIALIZED_SIZE; - assert(problem_item_get_size(itm, ¤t_size) == 0); - assert(current_size != PROBLEM_ITEM_UNINITIALIZED_SIZE); - assert(current_size == old_size); -@@ -97,7 +97,7 @@ int main(int argc, char **argv) - { - g_free(itm->content); - itm->content = NULL; -- size_t current_size = PROBLEM_ITEM_UNINITIALIZED_SIZE; -+ unsigned long current_size = PROBLEM_ITEM_UNINITIALIZED_SIZE; - assert(problem_item_get_size(itm, ¤t_size) == 0); - assert(current_size != PROBLEM_ITEM_UNINITIALIZED_SIZE); - assert(current_size == old_size); -@@ -120,7 +120,7 @@ int main(int argc, char **argv) - struct problem_item *itm = problem_data_add_ext(data, "2", flnm, CD_FLAG_BIN, PROBLEM_ITEM_UNINITIALIZED_SIZE); - - { -- size_t current_size = PROBLEM_ITEM_UNINITIALIZED_SIZE; -+ unsigned long current_size = PROBLEM_ITEM_UNINITIALIZED_SIZE; - assert(problem_item_get_size(itm, ¤t_size) == 0); - assert(current_size != PROBLEM_ITEM_UNINITIALIZED_SIZE); - assert(current_size == old_size); -@@ -129,7 +129,7 @@ int main(int argc, char **argv) - close(flds); - unlink(flnm); - assert(stat(flnm, &buf) != 0); -- size_t current_size = PROBLEM_ITEM_UNINITIALIZED_SIZE; -+ unsigned long current_size = PROBLEM_ITEM_UNINITIALIZED_SIZE; - assert(problem_item_get_size(itm, ¤t_size) == 0); - assert(current_size != PROBLEM_ITEM_UNINITIALIZED_SIZE); - assert(current_size == old_size); diff --git a/libreport-c89.patch b/libreport-c89.patch deleted file mode 100644 index 3f1770d..0000000 --- a/libreport-c89.patch +++ /dev/null @@ -1,28 +0,0 @@ -Remove incorrect casts from tests/string_list.at - -The list_order argument already has the correct pointer type const -char * const * (after array-to-pointer decay). - -Submitted upstream: - -diff --git a/tests/string_list.at b/tests/string_list.at -index 6af162a2f8da3919..2118298da4de0ec3 100644 ---- a/tests/string_list.at -+++ b/tests/string_list.at -@@ -22,13 +22,13 @@ int main(void) - NULL - }; - -- int index = libreport_index_of_string_in_list(FILENAME_REASON, (char**) list_order); -+ int index = libreport_index_of_string_in_list(FILENAME_REASON, list_order); - assert(index == 0); - -- index = libreport_index_of_string_in_list(FILENAME_COUNT, (char**) list_order); -+ index = libreport_index_of_string_in_list(FILENAME_COUNT, list_order); - assert(index == 5); - -- index = libreport_index_of_string_in_list("other", (char**) list_order); -+ index = libreport_index_of_string_in_list("other", list_order); - assert(index < 0); - - return 0; diff --git a/libreport.spec b/libreport.spec index a4f068e..1b60673 100644 --- a/libreport.spec +++ b/libreport.spec @@ -12,11 +12,15 @@ %define glib_ver 2.43.4 +%if "x%{?rhbz_product_version}" == "x" + %define rhbz_product_version %(source /etc/os-release; echo ${REDHAT_BUGZILLA_PRODUCT_VERSION}) +%endif + Summary: Generic library for reporting various problems Name: libreport -Version: 2.17.15 -Release: 9%{?dist} -License: GPL-2.0-or-later +Version: 2.17.4 +Release: 1%{?dist} +License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: %{dbus_devel} @@ -110,8 +114,6 @@ Requires: libreport >= %{version}-%{distfreerelease} Requires: libreport = %{version}-%{release} %endif Requires: python3-dnf -Requires: python3-requests -Requires: python3-urllib3 %{?python_provide:%python_provide python3-libreport} %description -n python3-libreport @@ -191,7 +193,7 @@ Summary: %{name}'s bugzilla plugin Requires: %{name} = %{version}-%{release} Requires: libreport-web = %{version}-%{release} Requires: python3-libreport = %{version}-%{release} -%if 0%{?fedora} >= 38 +%if "%{rhbz_product_version}" == "rawhide" Requires: python3-satyr Suggests: python3-pytest Suggests: python3-vcrpy @@ -370,10 +372,6 @@ rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5 %endif -%if 0%{?fedora} >= 38 - mv %{buildroot}/%{_bindir}/reporter-bugzilla-python %{buildroot}/%{_bindir}/reporter-bugzilla -%endif - %check make check|| { # find and print the logs of failed test @@ -564,8 +562,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/bugzilla_formatdup_analyzer_libreport.conf.5.* %{_mandir}/man5/bugzilla_format_kernel.conf.5.* %{_bindir}/reporter-bugzilla -%if 0%{?fedora} < 38 %{_bindir}/reporter-bugzilla-python + +%post plugin-bugzilla +%if "%{rhbz_product_version}" == "rawhide" + mv %{_bindir}/reporter-bugzilla-python %{_bindir}/reporter-bugzilla %endif %endif @@ -669,134 +670,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Fri Sep 19 2025 Python Maint - 2.17.15-9 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 2.17.15-8 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Thu Jul 24 2025 Fedora Release Engineering - 2.17.15-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 2.17.15-6 -- Rebuilt for Python 3.14 - -* Mon Jan 20 2025 Fedora Release Engineering - 2.17.15-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 2.17.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 2.17.15-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 2.17.15-2 -- Rebuilt for Python 3.13 - -* Sun Feb 18 2024 Packit - 2.17.15-1 -- Release version 2.17.15 (Michal Srb) -- reporter-bugzilla: Make the supplementary bugs easily identifiable (Michal Srb) -- reporter-bugzilla: Fix formatting in the supplementary bugs (Michal Srb) -- reporter-bugzilla: Fix code comment (Michal Srb) - -* Mon Feb 12 2024 Packit - 2.17.14-1 -- Release version 2.17.14 (Michal Srb) -- reporter-bugzilla: Reduce number of duplicate bug reports (Michal Srb) -- reporter-bugzilla: Fix config loading (Michal Srb) -- reporter-bugzilla: API key must consist of latin-1 characters (Michal Srb) -- reporter-bugzilla: Fix typo (Michal Srb) -- reporter-bugzilla: Fix creating binary attachments (Michal Srb) -- Update translations (mgrabovsky) - -* Sun Feb 04 2024 Packit - 2.17.13-1 -- Release version 2.17.13 (Michal Srb) -- Exclude coredump archives when creating a bug (Michal Srb) - -* Thu Jan 25 2024 Fedora Release Engineering - 2.17.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Florian Weimer - 2.17.11-5 -- Fix C compatibility issues in tests - -* Sun Jan 21 2024 Fedora Release Engineering - 2.17.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 2.17.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jul 01 2023 Python Maint - 2.17.11-2 -- Rebuilt for Python 3.12 - -* Fri Jun 30 2023 Packit - 2.17.11-1 -- Release version 2.17.11 (Michal Srb) -- spec: Add missing requires for python3-libreport (Michal Srb) -- Build URL with urllib.parse.urljoin() (Michal Srb) -- Add XDG_ACTIVATION_TOKEN to the list of ignored words (Michal Srb) -- Attachments are minor updates in Bugzilla (Michal Srb) -- Retry Bugzilla search queries with delays (Michal Srb) -- Fix "NameError: name 'ticket' is not defined" exception (Michal Srb) -- Update translations (mgrabovsky) - -* Thu Jun 15 2023 Python Maint - 2.17.10-2 -- Rebuilt for Python 3.12 - -* Thu May 11 2023 Packit - 2.17.10-1 -- Release version 2.17.10 (Matěj Grabovský) -- reporter-upload: Fix a use-after-free error in string handling (Matěj Grabovský) -- Update translations (mgrabovsky) -- Update translations (mgrabovsky) - -* Fri Mar 24 2023 Packit - 2.17.9-1 -- Release version 2.17.9 (Michal Srb) -- reporter-bugzilla: Fix string interpolation (Matěj Grabovský) -- reporter-bugzilla: Replace flags with just keyword arg (Michal Srb) -- reporter-bugzilla: Make sure that the creator of a bug is always in CC (Michal Srb) -- reporter-bugzilla: Don't fail if reported_to file doesn't exist (Michal Srb) -- reporter-bugzilla: Fix reporting when the bug already exists (Michal Srb) -- use $XDG_CONFIG_HOME to access user's configuration files (Yann Droneaud) -- Update translations (mgrabovsky) - -* Fri Mar 03 2023 Packit - 2.17.8-1 -- Release version 2.17.8 (Michal Srb) -- Update changelog (Michal Srb) -- reporter-bugzilla: Fix KeyError when HOME env var is not set (Michal Srb) -- Update changelog (Michal Srb) -- reporter-bugzilla: Fix password prompt in client/server mode (Michal Srb) - -* Mon Feb 20 2023 Packit - 2.17.7-1 -- Release version 2.17.7 (Michal Srb) -- spec: Add disttag (Michal Srb) -- Update changelog (Michal Srb) -- Fix rpm -V issue with missing reporter-bugzilla-python in f38 (Michal Srb) -- Fix TypeError (Michal Srb) -- Update pot file (Matěj Grabovský) -- readme: Add diagram of related projects (Matěj Grabovský) -- Update translations (mgrabovsky) -- Use SPDX format for license field (Matěj Grabovský) -- ignored_words: Add KeyboardInterrupt (Michal Fabik) -- packit: Add dependencies for SRPM build (Matěj Grabovský) -- Update translations (mgrabovsky) - -* Thu Jan 19 2023 Fedora Release Engineering - 2.17.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Nov 06 2022 Packit - 2.17.6-1 -- Release version 2.17.6 (Michal Srb) -- Update translations (mgrabovsky) -- Update changelog (Michal Srb) -- reporter-bugzilla: Fix TypeError (Michal Srb) - -* Mon Oct 24 2022 Michal Srb - 2.17.5-2 -- Fix dist-tag - -* Mon Oct 24 2022 Packit - 2.17.5-1 -- Release version 2.17.5 (Michal Srb) -- Update changelog (Michal Srb) -- dump_dir.py: check that the filename doesn't start with "/" (Michal Srb) -- dump_dir.py: Don't pass libreport flags to open() (Michal Srb) -- reporter-bugzilla: Fix exceptions (Michal Srb) -- Update translations (mgrabovsky) - * Wed Sep 14 2022 Packit - 2.17.4-1 - Release version 2.17.4 (Michal Fabik) - Update changelog (Michal Fabik) @@ -832,12 +705,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Update translations (mgrabovsky) - ignored_words: Ignore more debuginfod URLs (Matěj Grabovský) -* Thu Jul 21 2022 Fedora Release Engineering - 2.17.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 2.17.1-2 -- Rebuilt for Python 3.11 - * Thu Mar 10 2022 Packit Service - 2.17.1-1 - Release version 2.17.1 (Michal Srb) - reporter-bugzilla: send API key in HTTP header (Michal Srb) diff --git a/sources b/sources index 3f8648a..08e0a4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libreport-2.17.15.tar.gz) = a4707f5272f037f91b4f4b562d3f0eb165ae7790699714accdd1af40216f37bd40d430a06925b1b7b8ac2d2cf97fd0cc4efded51dc22d21d9ef2abedf796e5fe +SHA512 (libreport-2.17.4.tar.gz) = 71332661396e693ee469f029978df3d1bfc68a2a180913f120c765a5599c41aadcee17f58e428b9cc2a1b0fec565b4d4766169767dbca5141217ecd52051f111