From edd28393e324c66e110d9300d142ded41de72de826029bae013e5018b739daa4 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 1 Sep 2021 11:10:32 +0000
Subject: [PATCH 1/2] Accepting request 915315 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/915315
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/json-glib?expand=0&rev=87
---
 json-glib-1.6.4.tar.xz |  3 ---
 json-glib-1.6.6.tar.xz |  3 +++
 json-glib.changes      | 12 ++++++++++++
 json-glib.spec         |  9 ++++++---
 4 files changed, 21 insertions(+), 6 deletions(-)
 delete mode 100644 json-glib-1.6.4.tar.xz
 create mode 100644 json-glib-1.6.6.tar.xz

diff --git a/json-glib-1.6.4.tar.xz b/json-glib-1.6.4.tar.xz
deleted file mode 100644
index cbe150a..0000000
--- a/json-glib-1.6.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1f6a7930808f77a827f3b397a04bb89d4c0c0b2550885d4a5e4c411dfa13f5f
-size 168748
diff --git a/json-glib-1.6.6.tar.xz b/json-glib-1.6.6.tar.xz
new file mode 100644
index 0000000..0327607
--- /dev/null
+++ b/json-glib-1.6.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e
+size 1306232
diff --git a/json-glib.changes b/json-glib.changes
index 12b3715..9144a78 100644
--- a/json-glib.changes
+++ b/json-glib.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Aug 25 17:06:23 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.6.6:
+  + New release with the documentation and gi-docgen included in
+    the archive.
+- Build API documentation again, add python3-gi-docgen BuildRequires
+  and pass gtk_doc=enabled to meson.
+- Drop gtk-doc BuildRequires, no longer needed, nor used.
+- Add docbook-xsl-stylesheets and libxslt-tools BuildRequires,
+  needed for building of manpages.
+
 -------------------------------------------------------------------
 Sat Aug 21 22:41:31 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/json-glib.spec b/json-glib.spec
index 1ddd00f..fa2bf5f 100644
--- a/json-glib.spec
+++ b/json-glib.spec
@@ -18,7 +18,7 @@
 
 
 Name:           json-glib
-Version:        1.6.4
+Version:        1.6.6
 Release:        0
 Summary:        Library for JavaScript Object Notation format
 License:        LGPL-2.1-or-later
@@ -28,11 +28,13 @@ URL:            http://live.gnome.org/JsonGlib
 Source0:        https://download.gnome.org/sources/json-glib/1.6/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 
+BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  glib2-devel >= 2.54
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk-doc
+BuildRequires:  libxslt-tools
 BuildRequires:  meson
 BuildRequires:  pkgconfig
+BuildRequires:  python3-gi-docgen
 BuildRequires:  translation-update-upstream
 
 %description
@@ -98,7 +100,7 @@ translation-update-upstream po %{name}-1.0
 %build
 %meson \
 	-Dman=true \
-	-Dgtk_doc=disabled \
+	-Dgtk_doc=enabled \
 	%{nil}
 %meson_build
 
@@ -127,6 +129,7 @@ translation-update-upstream po %{name}-1.0
 %{_bindir}/json-glib-validate
 %{_mandir}/man1/json-glib-format.1%{ext_man}
 %{_mandir}/man1/json-glib-validate.1%{ext_man}
+%{_datadir}/doc/json-glib-1.0/
 #
 %{_includedir}/%{name}-1.0
 %{_libdir}/*.so

From 118abc354c9d416700054f63f9c418aa0e4d93e4cfa77a621dd3f0113c68e1e7 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 6 Sep 2021 07:20:36 +0000
Subject: [PATCH 2/2] Accepting request 916109 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/916109
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/json-glib?expand=0&rev=88
---
 json-glib.changes | 2 --
 json-glib.spec    | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/json-glib.changes b/json-glib.changes
index 9144a78..7b52f2f 100644
--- a/json-glib.changes
+++ b/json-glib.changes
@@ -4,8 +4,6 @@ Wed Aug 25 17:06:23 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 - Update to version 1.6.6:
   + New release with the documentation and gi-docgen included in
     the archive.
-- Build API documentation again, add python3-gi-docgen BuildRequires
-  and pass gtk_doc=enabled to meson.
 - Drop gtk-doc BuildRequires, no longer needed, nor used.
 - Add docbook-xsl-stylesheets and libxslt-tools BuildRequires,
   needed for building of manpages.
diff --git a/json-glib.spec b/json-glib.spec
index fa2bf5f..4cf9d49 100644
--- a/json-glib.spec
+++ b/json-glib.spec
@@ -34,7 +34,6 @@ BuildRequires:  gobject-introspection-devel
 BuildRequires:  libxslt-tools
 BuildRequires:  meson
 BuildRequires:  pkgconfig
-BuildRequires:  python3-gi-docgen
 BuildRequires:  translation-update-upstream
 
 %description
@@ -100,7 +99,7 @@ translation-update-upstream po %{name}-1.0
 %build
 %meson \
 	-Dman=true \
-	-Dgtk_doc=enabled \
+	-Dgtk_doc=disabled \
 	%{nil}
 %meson_build
 
@@ -129,7 +128,6 @@ translation-update-upstream po %{name}-1.0
 %{_bindir}/json-glib-validate
 %{_mandir}/man1/json-glib-format.1%{ext_man}
 %{_mandir}/man1/json-glib-validate.1%{ext_man}
-%{_datadir}/doc/json-glib-1.0/
 #
 %{_includedir}/%{name}-1.0
 %{_libdir}/*.so