diff --git a/0002-Fix-build-with-libxml2-2.12.0.patch b/0002-Fix-build-with-libxml2-2.12.0.patch new file mode 100644 index 0000000..530805e --- /dev/null +++ b/0002-Fix-build-with-libxml2-2.12.0.patch @@ -0,0 +1,23 @@ +From c918fe77e255150938e83a6aec259f153d303573 Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Sun, 19 Nov 2023 11:18:11 +0100 +Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 + +Fixes #219 +--- + src/test-subclassing.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/test-subclassing.c b/src/test-subclassing.c +index dd099e44..0758164f 100644 +--- a/src/test-subclassing.c ++++ b/src/test-subclassing.c +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + +-- +GitLab + diff --git a/shared-mime-info.spec b/shared-mime-info.spec index 8a6f59e..f340354 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -1,15 +1,19 @@ Name: shared-mime-info Version: 2.4 -Release: 1 +Release: 2 Summary: Shared MIME information database -License: GPLv2+ +License: GPL-2.0-or-later URL: https://freedesktop.org/wiki/Software/shared-mime-info/ Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version}/shared-mime-info-%{version}.tar.gz Source1: mimeapps.list Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch +Patch1: 0002-Fix-build-with-libxml2-2.12.0.patch -BuildRequires: gcc gcc-c++ libxml2-devel glib2-devel gettext intltool perl-XML-Parser meson itstool xmlto +BuildRequires: gcc gcc-c++ gettext intltool perl-XML-Parser meson itstool xmlto +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.6.0 +BuildRequires: pkgconfig(libxml-2.0) >= 2.4 %global __requires_exclude ^/usr/bin/pkg-config$ @@ -40,6 +44,10 @@ find $RPM_BUILD_ROOT%{_datadir}/mime -type f -not -path "*/packages/*" \ install -d $RPM_BUILD_ROOT%{_datadir}/applications install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/mimeapps.list +# remove bogus translation files +# translations are already in the xml file installed +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/* + %check %meson_test @@ -53,20 +61,26 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||: update-mime-database -n %{_datadir}/mime &> /dev/null ||: %files -%defattr(-,root,root) %license COPYING %{_bindir}/update-mime-database %{_datadir}/applications/*.list %{_datadir}/mime/packages/*.org.xml +%dir %{_datadir}/pkgconfig %{_datadir}/pkgconfig/shared-mime-info.pc -%{_datadir}/gettext/* -%exclude %{_datadir}/locale/* +%dir %{_datadir}/gettext +%dir %{_datadir}/gettext/its +%{_datadir}/gettext/its/shared-mime-info.its +%{_datadir}/gettext/its/shared-mime-info.loc %files help -%doc README.md NEWS HACKING.md data/shared-mime-info-spec.xml -%{_mandir}/man1/*.gz +%doc README.md NEWS HACKING.md data/shared-mime-info-spec.xml +%{_mandir}/man1/* %changelog +* Wed Aug 07 2024 Funda Wang - 2.4-2 +- Remove locale files rather than exclude them +- fix build with libxml 2.12 + * Fri Feb 02 2024 zhouwenpei - 2.4-1 - Upgrade to 2.4