PR#2: Enable gtk-doc - rpms/pango - src.fedoraproject.org

rpms / pango

#2 Enable gtk-doc

Merged 2 years ago by pwu. Opened 2 years ago by pwu.

rpms/ pwu/pango gtk-doc into rawhide

Enable gtk-doc

Peng Wu • 2 years ago

24a79f1

pango.spec

file modified

+23 -4

		`@@ -9,7 +9,7 @@`

		`Name: pango`
		`Version: 1.50.8`
		`- Release: 2%{?dist}`
		`+ Release: 3%{?dist}`
		`Summary: System for layout and rendering of internationalized text`

		`License: LGPLv2+`
		`@@ -29,6 +29,7 @@`
		`BuildRequires: help2man`
		`BuildRequires: meson`
		`BuildRequires: gcc gcc-c++`
		`+ BuildRequires: gi-docgen`

		`Requires: glib2%{?_isa} >= %{glib2_version}`
		`Requires: freetype%{?_isa} >= %{freetype_version}`
		`@@ -60,8 +61,14 @@`
		`Requires: cairo-devel%{?_isa} >= %{cairo_version}`

		`%description devel`
		`- The pango-devel package includes the header files and developer documentation`
		`- for the pango package.`
		`+ The pango-devel package includes the header files for the pango package.`
		`+`
		`+ %package doc`
		`+ Summary: Developer documentation for pango`
		`+ Requires: pango%{?_isa} = %{version}-%{release}`
		`+`
		`+ %description doc`
		`+ The pango-doc package contains developer documentation for the pango package.`

		`%package tests`
		`Summary: Tests for the %{name} package`
		`@@ -78,7 +85,8 @@`

		`%build`
		`%meson \`
		`- -Dinstall-tests=true`
		`+ -Dinstall-tests=true \`
		`+ -Dgtk_doc=true`

		`%meson_build`

		`@@ -120,12 +128,23 @@`
		`%{_datadir}/gir-1.0/PangoOT-1.0.gir`
		`%{_datadir}/gir-1.0/PangoXft-1.0.gir`

		`+ %files doc`
		`+ %{_docdir}/Pango/`
		`+ %{_docdir}/PangoCairo/`
		`+ %{_docdir}/PangoFT2/`
		`+ %{_docdir}/PangoFc/`
		`+ %{_docdir}/PangoOT/`
		`+ %{_docdir}/PangoXft/`
		`+`
		`%files tests`
		`%{_libexecdir}/installed-tests/%{name}`
		`%{_datadir}/installed-tests`


		`%changelog`
		`+ * Tue Jul 26 2022 Peng Wu <pwu@redhat.com> - 1.50.8-3`
		`+ - Enable gtk-doc`
		`+`
		`* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.50.8-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild`

no initial comment

tpopela commented on line 28 of pango.spec 2 years ago

Can the description of the pango-devel be changed? Because it currently says that pango-devel also contains the developer documentation. Or is it expected that both packages will contain a different documentation?

tpopela commented on line 15 of pango.spec 2 years ago

Does it really require these "random" python packages? I know that it's not relevant here, but I'm not looking forward on our teams maintaining them in RHEL 10+..

rebased onto a006342

2 years ago

pwu commented 2 years ago

Sorry, I just fixed the package description.

I think the python3 packages are pulled in by gi-docgen.
After enable -Dgtk_doc=true , the gi-docgen in the pango package is also enabled.

From meson.build:

gidocgen_dep = dependency('gi-docgen', version: '>= 2021.1',
                          fallback: ['gi-docgen', 'dummy_dep'],
                          required: get_option('gtk_doc'))

Edited 2 years ago by pwu

tpopela commented 2 years ago

@pwu for the python packages - can you then rather build require gi-docgen as it's packaged in Fedora - https://src.fedoraproject.org/rpms/gi-docgen ?

rebased onto 497ddca

2 years ago

pwu commented 2 years ago

Okay, updated the spec file again.

The pango package uses the gi-docgen package now.

Koji URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=90119331

tpopela commented 2 years ago

Looking at the meson files - is really gtk-doc required as a build requires? To me it looks like only gi-docgen is. Can you try a scratch build without gtk-doc specified as BR?

rebased onto ae5aef3

2 years ago

pwu commented 2 years ago

Okay, removed the gtk-doc BuildRequires.

Koji URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=90124626

tpopela commented 2 years ago

Thank you Peng! Looks good to me! @kalev can you rubber stamp it? :)

kalev commented 2 years ago

I think I would call the new subpackage 'pango-doc' instead of 'pango-devel-docs' because the rest of Fedora has pretty much standardized on *-doc for devel docs - see https://docs.fedoraproject.org/en-US/packaging-guidelines/#_documentation

An exception to this is gtk, but that's only because there is a separate gtk-doc project.

rebased onto 24a79f1

2 years ago

pwu commented 2 years ago

Okay, renamed the pango-devel-docs subpackage to the pango-doc subpackage.

Koji URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=90171289

Edited 2 years ago by pwu

kalev commented 2 years ago

Looks good to me! Thanks!

pwu commented 2 years ago

Thank you all! I will merge the patch soon.

Pull-Request has been merged by pwu