[rpms/glib2] cve-2026-58016-f44: Revert "Update build options, without actually changing anything"

[rpms/glib2] cve-2026-58016-f44: Revert "Update build options, without actually changing anything"

[Michael Catanzaro]

            A new commit has been pushed.

            Repo   : rpms/glib2
            Branch : cve-2026-58016-f44
            Commit : efd7d459172f4d38165ce9e9a3b06d955ea04282
            Author : Michael Catanzaro <mcatanzaro@redhat.com>
            Date   : 2024-04-30T14:28:08-05:00
            Stats  : +3/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/glib2/c/efd7d459172f4d38165ce9e9a3b06d955ea04282?branch=cve-2026-58016-f44

            Log:
            Revert "Update build options, without actually changing anything"

This reverts commit a53b6cfb2d012627923f4865e5e7af88e7c4ae3d.

This causes the build to fail. Apparently I failed to notice that even
though the tests were passing, the build itself does not. The problem is
that running the tests increases the number of files that get installed:

RPM build errors:
error: Installed (but unpackaged) file(s) found:
   /usr/lib/debug/usr/bin/gio-querymodules-2.80.0-4.fc41.x86_64.debug
    Duplicate build-ids /builddir/build/BUILDROOT/glib2-2.80.0-4.fc41.x86_64/usr/libexec/installed-tests/glib/642026 and /builddir/build/BUILDROOT/glib2-2.80.0-4.fc41.x86_64/usr/libexec/installed-tests/glib/642026-ec
    Duplicate build-ids /builddir/build/BUILDROOT/glib2-2.80.0-4.fc41.x86_64/usr/libexec/installed-tests/glib/cxx-98 and /builddir/build/BUILDROOT/glib2-2.80.0-4.fc41.x86_64/usr/libexec/installed-tests/glib/cxx-03
    Duplicate build-ids /builddir/build/BUILDROOT/glib2-2.80.0-4.fc41.x86_64/usr/lib/debug/usr/libexec/installed-tests/glib/642026-2.80.0-4.fc41.x86_64.debug and /builddir/build/BUILDROOT/glib2-2.80.0-4.fc41.x86_64/usr/lib/debug/usr/libexec/installed-tests/glib/642026-ec-2.80.0-4.fc41.x86_64.debug
    Duplicate build-ids /builddir/build/BUILDROOT/glib2-2.80.0-4.fc41.x86_64/usr/lib/debug/usr/libexec/installed-tests/glib/cxx-03-2.80.0-4.fc41.x86_64.debug and /builddir/build/BUILDROOT/glib2-2.80.0-4.fc41.x86_64/usr/lib/debug/usr/libexec/installed-tests/glib/cxx-98-2.80.0-4.fc41.x86_64.debug
    Installed (but unpackaged) file(s) found:
   /usr/lib/debug/usr/bin/gio-querymodules-2.80.0-4.fc41.x86_64.debug

This doesn't make sense and requires further investigation.

---
diff --git a/glib2.spec b/glib2.spec
index 1cd5cb0..621b7be 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -108,15 +108,17 @@ the functionality of the installed glib2 package.
 
 %build
 %meson \
+    -Dman=true \
     -Ddtrace=true \
     -Dsystemtap=true \
     -Dsysprof=enabled \
     -Dglib_debug=disabled \
-    -Ddocumentation=true \
+    -Dgtk_doc=true \
     -Dinstalled_tests=true \
     -Dgnutls=true \
     --default-library=both \
     %{nil}
+
 %meson_build
 
 %install