Compare commits

...

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

2
.gitignore vendored

@ -1 +1 @@
SOURCES/libgsf-1.14.47.tar.xz
SOURCES/libgsf-1.14.51.tar.xz

@ -1 +1 @@
5c8e7d2b5a1f525971fc318a6ea78fdf1083a31e SOURCES/libgsf-1.14.47.tar.xz
e8026c2abb8c7e38acaee6623a4b015d89b4d079 SOURCES/libgsf-1.14.51.tar.xz

@ -0,0 +1,24 @@
From b6719aa4a8a0fc3acfd8e7ab339b3493f7251b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
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 <gsf/gsf-fwd.h>
+#include <libxml/parser.h>
#include <libxml/tree.h>
G_BEGIN_DECLS
--
GitLab

@ -1,24 +1,47 @@
Summary: GNOME Structured File library
%global with_mingw 0
%if 0%{?fedora} && !0%{?flatpak}
%global with_mingw 1
%endif
Name: libgsf
Version: 1.14.47
Release: 5%{?dist}
License: LGPLv2
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.xz
URL: http://www.gnome.org/projects/libgsf/
Version: 1.14.51
Release: 6%{?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
BuildRequires: gettext
BuildRequires: glib2-devel
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
BuildRequires: libxml2-devel
BuildRequires: gdk-pixbuf2-devel
BuildRequires: make
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libxml-2.0)
Obsoletes: libgsf-gnome < 1.14.22
Obsoletes: libgsf-python < 1.14.26
%if %{with_mingw}
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw64-filesystem >= 95
BuildRequires: mingw64-gcc-c++
BuildRequires: mingw64-bzip2
BuildRequires: mingw32-bzip2
BuildRequires: mingw64-glib2
BuildRequires: mingw32-glib2
BuildRequires: mingw64-libxml2
BuildRequires: mingw32-libxml2
%endif
%description
A library for reading and writing structured files (e.g. MS OLE and Zip)
@ -32,20 +55,56 @@ Obsoletes: libgsf-gnome-devel < 1.14.22
Libraries, headers, and support files necessary to compile applications using
libgsf.
%if %{with_mingw}
%package -n mingw32-libgsf
Summary: MinGW GNOME Structured File library
BuildArch: noarch
%description -n mingw32-libgsf
A library for reading and writing structured files (e.g. MS OLE and Zip)
%package -n mingw64-libgsf
Summary: MinGW GNOME Structured File library
BuildArch: noarch
%description -n mingw64-libgsf
A library for reading and writing structured files (e.g. MS OLE and Zip)
%{?mingw_debug_package}
%endif
%prep
%setup -q
%autosetup -p1
%build
%global _configure ../configure
mkdir -p build/doc && pushd build
ln -s ../../doc/html doc # some day meson... libgsf!4
%configure --disable-gtk-doc --disable-static --enable-introspection=yes \
%if 0%{?flatpak}
--with-typelib_dir=%{_libdir}/girepository-1.0 --with-gir-dir=%{_datadir}/gir-1.0
%endif
make %{?_smp_mflags} V=1
%make_build
popd
%if %{with_mingw}
%mingw_configure --disable-static
%mingw_make_build
%endif
%install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=%{buildroot} install
pushd build
%make_install
popd
%if %{with_mingw}
%mingw_make_install
%mingw_debug_install_post
%mingw_find_lang %{name} --all-name
%endif
%find_lang %{name}
@ -53,12 +112,13 @@ make DESTDIR=%{buildroot} install
chrpath --delete %{buildroot}%{_bindir}/gsf*
# Remove .la files
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.la' -delete -print
%ldconfig_scriptlets
%files -f libgsf.lang
%doc AUTHORS COPYING COPYING.LIB README
%doc AUTHORS README
%license COPYING
%{_libdir}/libgsf-1.so.*
%{_libdir}/girepository-1.0/Gsf-1.typelib
%{_bindir}/gsf-office-thumbnailer
@ -78,13 +138,87 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_mandir}/man1/gsf.1*
%{_mandir}/man1/gsf-vba-dump.1*
%if %{with_mingw}
%files -n mingw32-libgsf -f mingw32-libgsf.lang
%license COPYING
%{mingw32_bindir}/gsf.exe
%{mingw32_bindir}/gsf-vba-dump.exe
%{mingw32_bindir}/gsf-office-thumbnailer.exe
%{mingw32_bindir}/libgsf-1-114.dll
%{mingw32_bindir}/libgsf-win32-1-114.dll
%{mingw32_libdir}/libgsf-1.dll.a
%{mingw32_libdir}/libgsf-win32-1.dll.a
%{mingw32_libdir}/pkgconfig/libgsf-1.pc
%{mingw32_libdir}/pkgconfig/libgsf-win32-1.pc
%{mingw32_includedir}/libgsf-1/
%{mingw32_mandir}/man1/gsf.1*
%{mingw32_mandir}/man1/gsf-vba-dump.1*
%{mingw32_mandir}/man1/gsf-office-thumbnailer.1*
%{mingw32_datadir}/thumbnailers/gsf-office.thumbnailer
%files -n mingw64-libgsf -f mingw64-libgsf.lang
%license COPYING
%{mingw64_bindir}/gsf.exe
%{mingw64_bindir}/gsf-vba-dump.exe
%{mingw64_bindir}/gsf-office-thumbnailer.exe
%{mingw64_bindir}/libgsf-1-114.dll
%{mingw64_bindir}/libgsf-win32-1-114.dll
%{mingw64_libdir}/libgsf-1.dll.a
%{mingw64_libdir}/libgsf-win32-1.dll.a
%{mingw64_libdir}/pkgconfig/libgsf-1.pc
%{mingw64_libdir}/pkgconfig/libgsf-win32-1.pc
%{mingw64_includedir}/libgsf-1/
%{mingw64_mandir}/man1/gsf.1*
%{mingw64_mandir}/man1/gsf-vba-dump.1*
%{mingw64_mandir}/man1/gsf-office-thumbnailer.1*
%{mingw64_datadir}/thumbnailers/gsf-office.thumbnailer
%endif
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.47-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.14.51-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.14.51-5
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.51-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.51-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Nov 30 2023 David King <amigadave@amigadave.com> - 1.14.51-2
- Fix building against libxml 2.12.0
- Use pkgconfig for BuildRequires
* Thu Nov 16 2023 Dan Horák <dan[at]danny.cz> - 1.14.51-1
- New upstream release 1.14.51
- Resolves: rhbz#2214335 rhbz#2249742 rhbz#2249979
* Wed Aug 02 2023 Marc-André Lureau <marcandre.lureau@redhat.com> - 1.14.50-4
- Add MinGW packages
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.50-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Apr 27 2023 Florian Weimer <fweimer@redhat.com> - 1.14.50-2
- Port configure script to C99
* Thu Mar 23 2023 Caolán McNamara <caolanm@redhat.com> 1.14.50-1
- latest version
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.47-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.47-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.47-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.47-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.47-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.47-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save