From 029172473e5023c68c272dd7328b1c03fc288fca Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 5 May 2021 08:37:39 -0500 Subject: [PATCH] Add missing bundled provides --- glib2.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/glib2.spec b/glib2.spec index 42cced1..9af2d62 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,6 +1,6 @@ Name: glib2 Version: 2.68.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library of handy utility functions License: LGPLv2+ @@ -55,6 +55,11 @@ Obsoletes: glib2-fam < 2.67.1-3 # glib 2.59.0 hash table changes broke older gcr versions / password prompts in gnome-shell Conflicts: gcr < 3.28.1 +Provides: bundled(gnulib) +Provides: bundled(gvdb) +Provides: bundled(libcharset) +Provides: bundled(xdgmime) + %description GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, @@ -98,8 +103,9 @@ the functionality of the installed glib2 package. %autosetup -n glib-%{version} -p1 %build -# Bug 1324770: Also explicitly remove PCRE sources since we use --with-pcre=system -rm glib/pcre/*.[ch] +# No surprise bundled libraries +rm -rf glib/pcre +rm -rf subprojects # We cannot build with GnuTLS in Fedora since there is no gnutls-static # subpackage. (glib2-static is needed by qemu in Fedora, but not in RHEL.) @@ -241,6 +247,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/installed-tests %changelog +* Wed May 05 2021 Michael Catanzaro - 2.68.1-3 +- Add missing bundled provides + * Wed Apr 28 2021 Michael Catanzaro - 2.68.1-2 - Refresh GDesktopAppInfo patchset