From b8404516477c34236e29b04c7bbced6fec66f4b5 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 1 Oct 2020 21:27:54 +0200
Subject: [PATCH] Update to 1.33

- Switch to meson build system
---
 .gitignore   |  1 +
 gtk-doc.spec | 24 +++++++++++++-----------
 sources      |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index d48b274..6184488 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ gtk-doc-1.15.tar.bz2
 /gtk-doc-1.28.tar.xz
 /gtk-doc-1.29.tar.xz
 /gtk-doc-1.32.tar.xz
+/gtk-doc-1.33.0.tar.xz
diff --git a/gtk-doc.spec b/gtk-doc.spec
index d1e5989..4e4bd9e 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -3,13 +3,13 @@
 %global __python %{__python3}
 
 Name: gtk-doc
-Version: 1.32
-Release: 5%{?dist}
+Version: 1.33.0
+Release: 1%{?dist}
 Summary: API documentation generation tool for GTK+ and GNOME
 
 License: GPLv2+ and GFDL
 URL: http://www.gtk.org/gtk-doc
-Source0: http://download.gnome.org/sources/%{name}/1.32/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/%{name}/1.33/%{name}-%{version}.tar.xz
 
 # Partially revert a gtk-doc 1.31 change that broke e-d-s and NM builds
 # https://bugzilla.redhat.com/show_bug.cgi?id=1775560
@@ -23,6 +23,8 @@ BuildRequires: /usr/bin/xsltproc
 BuildRequires: docbook-style-xsl
 BuildRequires: gcc
 BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: meson
 BuildRequires: python3-devel
 BuildRequires: python3-pygments
 BuildRequires: python3-parameterized
@@ -49,18 +51,14 @@ and GNOME.
 mv doc/README doc/README.docs
 
 %build
-export PYTHON=%{__python3}
-%configure --disable-silent-rules
-%make_build
+%meson
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 %check
-if ! make check; then
-    cat tests/test-suite.log
-    exit 1
-fi
+%meson_test
 
 %files
 %license COPYING COPYING-DOCS
@@ -73,6 +71,10 @@ fi
 %{_datadir}/cmake/
 
 %changelog
+* Thu Oct 01 2020 Kalev Lember <klember@redhat.com> - 1.33-1
+- Update to 1.33
+- Switch to meson build system
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.32-5
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index f8ff727..0b1e6bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gtk-doc-1.32.tar.xz) = 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
+SHA512 (gtk-doc-1.33.0.tar.xz) = 734440b61edc4101fbb34397036ddafa4003aa31f0a2258e0a855a563460d8e626588cb513b1a7850f6f843bbeb0a626ed33266a4dead5c10a4930fe688cfec9