From 0fe24ac6f510af5a647d4438f7a1fdb60136de3c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 2 Feb 2022 09:51:58 -0600 Subject: [PATCH] shared-mime-info FTBFS (#2047009) make xdgmime build use rpm build flags --- shared-mime-info-2.1-CFLAGS.patch | 11 +++++++++++ shared-mime-info.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 shared-mime-info-2.1-CFLAGS.patch diff --git a/shared-mime-info-2.1-CFLAGS.patch b/shared-mime-info-2.1-CFLAGS.patch new file mode 100644 index 0000000..57bdf5f --- /dev/null +++ b/shared-mime-info-2.1-CFLAGS.patch @@ -0,0 +1,11 @@ +diff -up shared-mime-info-2.1/xdgmime/Makefile.CFLAGS shared-mime-info-2.1/xdgmime/Makefile +diff -up shared-mime-info-2.1/xdgmime/src/Makefile.CFLAGS shared-mime-info-2.1/xdgmime/src/Makefile +--- shared-mime-info-2.1/xdgmime/src/Makefile.CFLAGS 2020-12-30 03:24:55.000000000 -0600 ++++ shared-mime-info-2.1/xdgmime/src/Makefile 2022-02-02 09:37:38.529264264 -0600 +@@ -1,5 +1,5 @@ + +-CFLAGS=-Wall -Wmissing-prototypes -Wno-sign-compare -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP ++CFLAGS=-Wall -Wmissing-prototypes -Wno-sign-compare -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP $(RPM_OPT_FLAGS) + + all: test-mime test-mime-data print-mime-data + diff --git a/shared-mime-info.spec b/shared-mime-info.spec index 0b6fc13..e8f9c1b 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://freedesktop.org/Software/shared-mime-info Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz @@ -11,6 +11,8 @@ Source1: mimeapps.list %global xdgmime_commit de283fc430460b9b3a7e61432a6d273cd64cb102 # Tarball for https://gitlab.freedesktop.org/xdg/xdgmime/-/tree/%%{xdgmime_commit} Source6: https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/%{xdgmime_commit}/xdgmime-%{xdgmime_commit}.tar.bz2 +# HACK in use of RPM_OPT_FLAGS into xdgmime build +Source7: shared-mime-info-2.1-CFLAGS.patch # Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354 Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch @@ -40,6 +42,7 @@ and looking up the correct MIME type in a database. %autosetup -S git_am tar xjf %SOURCE6 mv xdgmime-%{xdgmime_commit}/ xdgmime/ +patch -p1 < %SOURCE7 %build %make_build -C xdgmime @@ -93,6 +96,10 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||: %{_datadir}/gettext/its/shared-mime-info.loc %changelog +* Wed Feb 02 2022 Rex Dieter - 2.1-5 +- shared-mime-info FTBFS (#2047009) +- make xdgmime build use rpm build flags + * Sat Jan 22 2022 Fedora Release Engineering - 2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild