Accepting request 775603 from home:iznogood:branches:GNOME:Factory

Revert removal of gtk-doc during build

OBS-URL: https://build.opensuse.org/request/show/775603
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=420

glib2.changes

@@ -23,13 +23,6 @@ Sat Jan 25 14:08:46 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
 - No longer recommend -lang: supplements are in use
 
--------------------------------------------------------------------
-Sat Jan 11 00:37:22 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Drop gtk-doc BuildRequires: eliminate a build cycle. In a 2nd
-  step we will try to provide a glib2-devel-doc package as part of
-  a _multibuild. Also drop -Dgtk_doc=true meson parameter.
-
 -------------------------------------------------------------------
 Thu Dec 19 17:45:31 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 

glib2.spec

@@ -51,6 +51,7 @@ BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gamin-devel
 BuildRequires:  gcc-c++
+BuildRequires:  gtk-doc
 BuildRequires:  libselinux-devel
 BuildRequires:  m4
 BuildRequires:  meson >= 0.49.2
@@ -66,6 +67,8 @@ BuildRequires:  pkgconfig(libffi) >= 3.0.0
 BuildRequires:  pkgconfig(libpcre) >= 8.31
 BuildRequires:  pkgconfig(mount) >= 2.28
 BuildRequires:  pkgconfig(zlib)
+# gtk-doc requires glib2-devel, but we will only be building this here; break up a cycle
+#!BuildIgnore:  glib2-devel
 %if %{with systemtap}
 BuildRequires:  systemtap-dtrace
 BuildRequires:  systemtap-headers
@@ -267,6 +270,7 @@ grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|%
 	--default-library=both \
 	-Dselinux=enabled \
 	-Dman=true \
+	-Dgtk_doc=true \
 	-Dfam=true \
 %if %{with systemtap}
 	-Dsystemtap=true \
@@ -301,7 +305,6 @@ ln -s %{_localstatedir}/cache/gio-2.0/gnome-mimeapps.list %{buildroot}%{_datadir
 %if "%{_lib}" == "lib64"
 mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-64
 %endif
-mkdir -p %{buildroot}%{_datadir}/gtk-doc/html/
 mkdir -p %{buildroot}%{_libdir}/gio/modules
 touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache
 # gsettings magic
@@ -485,6 +488,9 @@ done
 %dir %{_libdir}/glib-2.0/
 %{_libdir}/glib-2.0/include/
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/gtk-doc/html/gio
+%{_datadir}/gtk-doc/html/glib
+%{_datadir}/gtk-doc/html/gobject
 %{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py
 %if %{with systemtap}
 %dir %{_datadir}/systemtap