From ca5976b4a6a764e4f002eed74dbaeb73b992c8a0 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 16 Feb 2022 15:29:01 -0500
Subject: [PATCH] Update to 2022.1 (close RHBZ#2053858)

---
 .gitignore     |  1 +
 gi-docgen.spec | 52 +++++++++++++++++++++++++++++++++++++++++---------
 sources        |  2 +-
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index d873e13..caab93d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gi-docgen-2021.6.tar.bz2
 /gi-docgen-2021.7.tar.bz2
 /gi-docgen-2021.8.tar.bz2
+/gi-docgen-2022.1.tar.bz2
diff --git a/gi-docgen.spec b/gi-docgen.spec
index a386b15..38f3527 100644
--- a/gi-docgen.spec
+++ b/gi-docgen.spec
@@ -8,29 +8,60 @@
 %bcond_without doc_pdf
 
 Name:           gi-docgen
-Version:        2021.8
+Version:        2022.1
 %forgemeta
 Release:        %autorelease
 Summary:        Documentation tool for GObject-based libraries
 
-# The entire source is (ASL 2.0 or GPLv3+) except:
+# Based on the “Copyright and Licensing terms” in README.md, on the contents of
+# .reuse/dep5, and on inspection of SPDX headers or other file contents with
+# assistance from licensecheck.
+#
+# The entire source is (ASL 2.0 or GPLv3+) except the following files that are
+# packaged or are used to generate packaged files:
 #
 # MIT:
 #   - gidocgen/templates/basic/fzy.js
+#   - gidocgen/templates/basic/solarized-{dark,light}.js
 #
 # CC0:
+#   - .editorconfig (not packaged)
+#   - .gitlab-ci.yml (not packaged)
+#   - gi-docgen.pc.in (from which gi-docgen.pc is generated)
+#   - gidocgen/templates/basic/*.png
 #   - docs/CODEOWNERS (-doc subpackage)
 #   - examples/*.toml (-doc subpackage)
 #   - gi-docgen.doap (not installed)
 #   - gidocgen/porter.py
 #   - MANIFEST.in (not installed)
 #
-# CC-BY:
+# CC-BY-SA:
 #   - code-of-conduct.md (-doc subpackage)
 #
+# Additionally, the following sources are under licenses other than (ASL 2.0 or
+# GPLv3+), but are not packaged in any of the binary RPMs:
+#
+# CC0:
+#   - .editorconfig (not packaged)
+#   - .gitlab-ci.yml (not packaged)
+#   - gi-docgen.doap (not installed)
+#   - MANIFEST.in (not installed)
+#   - pytest.ini (not installed)
+#
+# CC-BY-SA
+#   - docs/gi-docgen.{png,svg} (for HTML docs; not currently packaged)
+#
 # OFL:
-#   - gidocgen/templates/basic/RedHat* (removed in prep)
-#   - gidocgen/templates/basic/SourceCodePro* (removed in prep)
+#   - gidocgen/templates/basic/*.{woff,woff2} (removed in prep)
+#
+# GPLv2+:
+#   - test/gir/{Utility-1.0,Regress-1.0}.gir (not packaged; test only)
+#
+# LGPLv2+:
+#   - test/gir/{GLib,GObject,Gio}-2.0.gir (not packaged; test only)
+#
+# (LGPLv2+ or MPLv1.1):
+#   - test/gir/cairo-1.0.gir (not packaged; test only)
 License:        (ASL 2.0 or GPLv3+) and MIT and CC0
 URL:            %{forgeurl}
 Source0:        %{forgesource}
@@ -51,6 +82,8 @@ BuildArch:      noarch
 
 BuildRequires:  python3-devel
 
+BuildRequires:  python3dist(pytest)
+
 # Documentation
 %if %{with doc_pdf}
 BuildRequires:  make
@@ -124,7 +157,7 @@ to ensure the proper system fonts are present.
 
 %package doc
 Summary:        Documentation for gi-docgen
-License:        (ASL 2.0 or GPLv3+) and CC0 and CC-BY
+License:        (ASL 2.0 or GPLv3+) and CC0 and CC-BY-SA
 
 %description doc
 Documentation for gi-docgen.
@@ -169,11 +202,12 @@ install -t '%{buildroot}%{_pkgdocdir}' -p -m 0644 \
 cp -rp examples '%{buildroot}%{_pkgdocdir}/'
 
 
-# There are no upstream tests to run.
+%check
+%pytest
 
 
 %files -f %{pyproject_files}
-%license LICENSES/*.txt
+%license LICENSES/*.txt .reuse/dep5
 
 %{_bindir}/gi-docgen
 %{_mandir}/man1/gi-docgen.1*
@@ -188,7 +222,7 @@ cp -rp examples '%{buildroot}%{_pkgdocdir}/'
 
 
 %files doc
-%license LICENSES/*.txt
+%license LICENSES/*.txt .reuse/dep5
 %doc %{_pkgdocdir}
 
 
diff --git a/sources b/sources
index 9ffb997..31c42b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gi-docgen-2021.8.tar.bz2) = 4368864c0d90dc2c1a2b64658a0c0741aeedcdde43b71b4219818dc57a0178237a190ee4680395a008309ad5b48c159a5d1e5b670d2165875f1040e9f84c14a0
+SHA512 (gi-docgen-2022.1.tar.bz2) = 8f6997c3517d2cdc0690f9d71aeb473467db8fc26881700f15940858679a7cda001f63e9af4de4362d831b5d98aa583da81450cc9dbe8cc731c616d2f596e6ac