Accepting request 843412 from GNOME:Next

- Enable building of documentation:
  + Toggle gtk_doc from bcond_with to bcond_without.
  + Use sed to replace gtk-doc version in
    docs/reference/meson.build with 1.32.

OBS-URL: https://build.opensuse.org/request/show/843412
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=436
This commit is contained in:
Bjørn Lie 2020-10-22 12:22:00 +00:00 committed by Git OBS Bridge
parent 98b4154ebc
commit 10b8ecca1d
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 22 11:45:40 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Enable building of documentation:
+ Toggle gtk_doc from bcond_with to bcond_without.
+ Use sed to replace gtk-doc version in
docs/reference/meson.build with 1.32.
-------------------------------------------------------------------
Tue Oct 20 14:00:37 UTC 2020 - dimstar@opensuse.org

View File

@ -17,7 +17,7 @@
%bcond_without systemtap
%bcond_with gtk_doc
%bcond_without gtk_doc
Name: glib2
Version: 2.66.2
Release: 0
@ -53,7 +53,7 @@ BuildRequires: fdupes
BuildRequires: gamin-devel
BuildRequires: gcc-c++
%if %{with gtk_doc}
BuildRequires: gtk-doc >= 1.32.1
BuildRequires: gtk-doc >= 1.32
%endif
BuildRequires: libselinux-devel
BuildRequires: m4
@ -262,6 +262,7 @@ cp -a %{SOURCE4} gnome_defaults.conf
# replace /usr/bin/env shebangs
# /usr/bin/env @PYTHON@ -> /usr/bin/python3
grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|%{_bindir}/python3|g"
sed -i "s/1.32.1/1.32/" docs/reference/meson.build
%build
%if %{with systemtap}