From a313843be895ae2a85778a92c3dfb567d3c95aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 21 Apr 2024 01:20:06 +0100 Subject: [PATCH] Update libcomps to 0.1.21 Resolves: RHEL-38831 --- fix-build-libxml2-2.12.0.patch | 21 ------------------ libcomps-c99.patch | 40 ---------------------------------- libcomps.spec | 12 +++++----- sources | 2 +- 4 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 fix-build-libxml2-2.12.0.patch delete mode 100644 libcomps-c99.patch diff --git a/fix-build-libxml2-2.12.0.patch b/fix-build-libxml2-2.12.0.patch deleted file mode 100644 index f1789d7..0000000 --- a/fix-build-libxml2-2.12.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0cdeedbee8720d7b7735012c5cba8038ae4a38a0 Mon Sep 17 00:00:00 2001 -From: Nicola Sella -Date: Mon, 20 Nov 2023 16:56:47 +0100 -Subject: [PATCH] build: Restore compatiblity with libxml2-2.12.0 - ---- - libcomps/src/comps_doc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libcomps/src/comps_doc.c b/libcomps/src/comps_doc.c -index c5e65cd..d2292e8 100644 ---- a/libcomps/src/comps_doc.c -+++ b/libcomps/src/comps_doc.c -@@ -25,6 +25,7 @@ - - #include - #include -+#include - static signed char comps_doc_xml(COMPS_Doc *doc, xmlTextWriterPtr writer, - COMPS_XMLOptions *xml_options, - COMPS_DefaultsOptions *def_options); diff --git a/libcomps-c99.patch b/libcomps-c99.patch deleted file mode 100644 index 7dc7933..0000000 --- a/libcomps-c99.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit a71bce7e62990550a57688e51b14eb82d6de196b -Author: Aleš Matěj -Date: Tue Jan 2 08:32:55 2024 +0100 - - Fix build: use correct variable for category and env - - Fixes: - - error: assignment to ‘COMPS_DocGroup *’ from incompatible pointer type ‘COMPS_DocCategory *’ - - error: assignment to ‘COMPS_DocGroup *’ from incompatible pointer type ‘COMPS_DocEnv *’ - - For: https://fedoraproject.org/wiki/Changes/PortingToModernC - (https://fedoraproject.org/wiki/Toolchain/PortingToModernC) - (https://gitlab.com/fweimer-rh/fedora-modernc-logs/-/blob/main/logs/l/libcomps.log) - -diff --git a/libcomps/tests/check_parse.c b/libcomps/tests/check_parse.c -index e5935e129e43e4e7..689cb98da3a631b0 100644 ---- a/libcomps/tests/check_parse.c -+++ b/libcomps/tests/check_parse.c -@@ -585,8 +585,8 @@ START_TEST(test_arch) - list = comps_doc_categories(doc2); - ck_assert(list->len == 2); - for (it = list->first, x=0; it != NULL; it = it->next, x++) { -- g = (COMPS_DocCategory*)it->comps_obj; -- str = (COMPS_Str*)comps_doccategory_get_id(g); -+ c = (COMPS_DocCategory*)it->comps_obj; -+ str = (COMPS_Str*)comps_doccategory_get_id(c); - ck_assert_msg(strcmp(str->val, cats[0][x]) == 0, "%s != %s", - str->val, cats[0][x]); - COMPS_OBJECT_DESTROY(str); -@@ -605,8 +605,8 @@ START_TEST(test_arch) - list = comps_doc_environments(doc2); - ck_assert(list->len == 2); - for (it = list->first, x=0; it != NULL; it = it->next, x++) { -- g = (COMPS_DocEnv*)it->comps_obj; -- str = (COMPS_Str*)comps_docenv_get_id(g); -+ e = (COMPS_DocEnv*)it->comps_obj; -+ str = (COMPS_Str*)comps_docenv_get_id(e); - ck_assert_msg(strcmp(str->val, envs[0][x]) == 0, "%s != %s", - str->val, envs[0][x]); - COMPS_OBJECT_DESTROY(str); diff --git a/libcomps.spec b/libcomps.spec index d9e12d1..98a0024 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,19 +1,14 @@ %define __cmake_in_source_build 1 Name: libcomps -Version: 0.1.20 -Release: 5%{?dist} +Version: 0.1.21 +Release: 1%{?dist} Summary: Comps XML file manipulation library License: GPL-2.0-or-later URL: https://github.com/rpm-software-management/libcomps Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Fix build with libxml2 2.12.0 -# https://github.com/rpm-software-management/libcomps/pull/109 -Patch0: fix-build-libxml2-2.12.0.patch -Patch1: libcomps-c99.patch - BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: gcc @@ -121,6 +116,9 @@ popd %{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Sat Apr 20 2024 Sérgio Basto - 0.1.21-1 +- Update libcomps to 0.1.21 (RHEL-38831) + * Thu Jan 25 2024 Fedora Release Engineering - 0.1.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 6301e6c..a1629dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libcomps-0.1.20.tar.gz) = 02708343a9ab2ee290eb1e0ac6056658f95b84e5008c4abc1e5225c83f80edf109b40da4b44c461db5f1cc8d0620f0b6c452c101203c42f1764eb575741936a7 +SHA512 (libcomps-0.1.21.tar.gz) = b667bfca5872aa1244f49ad6810ecc08c314f7093d64bbbf886fe088abbe2dc18b242ad2d95ebcc28fa6952ee173802d57ef889ffdd4c3ac2612f88dff0c7d97