diff --git a/.gitignore b/.gitignore index 796bb8b..279ab3f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gi-docgen-2022.1.tar.bz2 /gi-docgen-2022.2.tar.bz2 /gi-docgen-2023.1.tar.bz2 +/gi-docgen-2023.3.tar.bz2 diff --git a/gi-docgen.spec b/gi-docgen.spec index da1d6ae..66b7931 100644 --- a/gi-docgen.spec +++ b/gi-docgen.spec @@ -5,7 +5,7 @@ %bcond doc_pdf 1 Name: gi-docgen -Version: 2023.1 +Version: 2023.3 Release: %autorelease Summary: Documentation tool for GObject-based libraries @@ -16,6 +16,9 @@ Summary: Documentation tool for GObject-based libraries # The entire source is (Apache-2.0 OR GPL-3.0-or-later) except the following files that are # packaged or are used to generate packaged files: # +# (Apache-2.0 OR GPL-3.0-or-later) AND BSD-2-Clause: +# - gidocgen/mdext.py +# # MIT: # - gidocgen/templates/basic/fzy.js # - gidocgen/templates/basic/solarized-{dark,light}.js @@ -26,8 +29,24 @@ Summary: Documentation tool for GObject-based libraries # - docs/CODEOWNERS (-doc subpackage) # - examples/*.toml (-doc subpackage) # -# Note that CC0-1.0 is allowed for content only; these files may reasonably be -# called content. +# Note that CC0-1.0 is allowed in Fedora for content only; all of the above +# files may reasonably be called content. +# +# Additionally, CC0-1.0 appears in certain sample configuration snippets within +# the following files, which are otherwise (Apache-2.0 OR GPL-3.0-or-later): +# - docs/project-configuration.rst +# - docs/tutorial.rst +# On one hand, these are copied from real projects; on the other hand, they are +# very trivial. It’s not obvious whether they should be considered “real” +# CC0-1.0 content or not. +# +# The identifier LGPL-2.1-or-later also appears in a sample configuration +# template in docs/tutorial.rst, but the configuration in question is filled +# with placeholder values and is not copied from a real project, so it’s +# reasonable to consider LGPL-2.1-or-later a placeholder rather than a real +# license as well. +# +# ----- # # Additionally, the following sources are under licenses other than (Apache-2.0 # OR GPL-3.0-or-later), but are not packaged in any of the binary RPMs: @@ -37,7 +56,8 @@ Summary: Documentation tool for GObject-based libraries # - .gitlab-ci.yml (not installed) # - gi-docgen.doap (not installed) # - MANIFEST.in (not installed) -# - pytest.ini (not installed) +# - pytest.ini (not installed; test only) +# - tests/data/config/*.toml (not installed; test only) # # CC-BY-SA-3.0: # - docs/gi-docgen.{png,svg} (for HTML docs; not currently packaged) @@ -47,14 +67,19 @@ Summary: Documentation tool for GObject-based libraries # - gidocgen/templates/basic/*.{woff,woff2} (removed in prep) # # GPL-2.0-or-later: -# - test/gir/{Utility-1.0,Regress-1.0}.gir (not installed; test only) +# - tests/data/gir/{Utility-1.0,Regress-1.0}.gir (not installed; test only) # # LGPL-2.0-or-later: -# - test/gir/{GLib,GObject,Gio}-2.0.gir (not installed; test only) +# - tests/data/gir/{GLib,GObject,Gio}-2.0.gir (not installed; test only) # # LGPL-2.0-or-later OR MPL-1.1: -# - test/gir/cairo-1.0.gir (not installed; test only) -License: (Apache-2.0 OR GPL-3.0-or-later) AND MIT AND CC0-1.0 +# - tests/data/gir/cairo-1.0.gir (not installed; test only) +License: %{shrink: + (Apache-2.0 OR GPL-3.0-or-later) AND + BSD-2-Clause AND + MIT AND + CC0-1.0 + } URL: https://gitlab.gnome.org/GNOME/gi-docgen Source: %{url}/-/archive/%{version}/gi-docgen-%{version}.tar.bz2 diff --git a/sources b/sources index 23708c2..cace401 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gi-docgen-2023.1.tar.bz2) = 27c484ff95efbf3e452c07aabcf4c598370fb936f505ccd4df15bc18eb868f129884de2566f807260477ecef224bf3f5bf89dc3a336cdc08fc7cedc5264f1310 +SHA512 (gi-docgen-2023.3.tar.bz2) = 0675a4e844b7ad640c38090049ebad8eee5e23f120f48252aec25f51929eadffddfb65ae684ef963bb4fed96de9d2886334317910f4e855e00fb1438d9faffc1