From c48f78e19e498981a8168021ea5522e641cde02b Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 20 Nov 2024 01:04:08 +0100 Subject: [PATCH] Synchronize to packaging changes in Fedora 40: Resolves: RHEL-66920 --- libgsf-1.14.51-libxml2-2.12.0-includes.patch | 24 -------------------- libgsf.spec | 14 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 libgsf-1.14.51-libxml2-2.12.0-includes.patch diff --git a/libgsf-1.14.51-libxml2-2.12.0-includes.patch b/libgsf-1.14.51-libxml2-2.12.0-includes.patch deleted file mode 100644 index 4f404d4..0000000 --- a/libgsf-1.14.51-libxml2-2.12.0-includes.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b6719aa4a8a0fc3acfd8e7ab339b3493f7251b22 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCrg=20Billeter?= -Date: Fri, 24 Nov 2023 19:47:35 +0100 -Subject: [PATCH] xml: Fix build with libxml2 2.12 - ---- - gsf/gsf-libxml.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gsf/gsf-libxml.h b/gsf/gsf-libxml.h -index 6c3e2e4..c0d618e 100644 ---- a/gsf/gsf-libxml.h -+++ b/gsf/gsf-libxml.h -@@ -23,6 +23,7 @@ - #define GSF_LIBXML_H - - #include -+#include - #include - - G_BEGIN_DECLS --- -GitLab - diff --git a/libgsf.spec b/libgsf.spec index c3b15ee..c5c627a 100644 --- a/libgsf.spec +++ b/libgsf.spec @@ -5,15 +5,13 @@ %endif Name: libgsf -Version: 1.14.51 -Release: 6%{?dist} +Version: 1.14.53 +Release: 2%{?dist} Summary: GNOME Structured File library License: LGPL-2.1-only URL: https://gitlab.gnome.org/GNOME/libgsf/ Source: https://download.gnome.org/sources/%{name}/1.14/%{name}-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/libgsf/-/merge_requests/14 -Patch: libgsf-1.14.51-libxml2-2.12.0-includes.patch BuildRequires: bzip2-devel BuildRequires: chrpath @@ -100,14 +98,14 @@ pushd build %make_install popd +%find_lang %{name} + %if %{with_mingw} %mingw_make_install %mingw_debug_install_post %mingw_find_lang %{name} --all-name %endif -%find_lang %{name} - # Remove lib rpaths chrpath --delete %{buildroot}%{_bindir}/gsf* @@ -175,6 +173,10 @@ find %{buildroot} -name '*.la' -delete -print %endif %changelog +* Wed Nov 20 2024 Carlos Garnacho - 1.14.53-2 +- Synchronize to packaging changes in Fedora 40: + Resolves: RHEL-66920 + * Tue Oct 29 2024 Troy Dawson - 1.14.51-6 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 diff --git a/sources b/sources index cefe6e0..79bd1e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgsf-1.14.51.tar.xz) = b7c02e10762c93909a1aacb86f30b266ed8b0eeefe73ede5acb8ac0c1094a1e4be2b7bd3a59ebfc03180f8f72f2cc602e80c871a1b8a28f3fccfdd403ad24da7 +SHA512 (libgsf-1.14.53.tar.xz) = f2f8fa0806bf2edae271b3503cc311bd7ba32c145530afce382305cacfaae624edbc8298bd8766364e94804e71b1b8d0aac8383ae514aad646f2a926727cf727