- updated docs packaging

[packages/pango.git] / pango.spec

diff --git a/pango.spec b/pango.spec
index b72c10353740ced44975eed8075e9cbe7091aaea..10dc41ea11f87d6826cfff7d20e3e14c11366a64 100644 (file)
--- a/pango.spec
+++ b/pango.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without apidocs         # disable gtk-doc
+%bcond_without apidocs         # gi documentation
 %bcond_without libthai         # thai-lang module
 %bcond_with    sysprof         # sysprof tracing support
 
@@ -8,13 +8,13 @@ Summary:      System for layout and rendering of internationalized text
 Summary(pl.UTF-8):     System renderowania międzynarodowego tekstu
 Summary(pt_BR.UTF-8):  Sistema para layout e renderização de texto internacionalizado
 Name:          pango
-Version:       1.48.0
+Version:       1.48.4
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         X11/Libraries
 Source0:       https://download.gnome.org/sources/pango/1.48/%{name}-%{version}.tar.xz
-# Source0-md5: ee5826242abd661fb5238e19b9e2e1aa
+# Source0-md5: 6c3cee28fc36118c1c8733160054c7ed
 URL:           https://pango.gnome.org/
 # cairo-ft cairo-pdf cairo-png cairo-ps cairo-xlib
 BuildRequires: cairo-devel >= 1.12.10
@@ -24,19 +24,20 @@ BuildRequires:      docbook-style-xsl
 BuildRequires: fontconfig-devel >= 1:2.12.92
 BuildRequires: freetype-devel >= 2.1.7
 BuildRequires: fribidi-devel >= 0.19.7
-BuildRequires: glib2-devel >= 1:2.60.0
-BuildRequires: gobject-introspection-devel >= 0.9.5
 %if %{with apidocs}
-BuildRequires: gtk-doc >= 1.15
+BuildRequires: gi-docgen >= 2021.1
 %endif
+BuildRequires: glib2-devel >= 1:2.62.0
+BuildRequires: gobject-introspection-devel >= 0.9.5
 BuildRequires: harfbuzz-devel >= 2.6.0
 BuildRequires: harfbuzz-gobject-devel >= 2.6.0
 %{?with_libthai:BuildRequires: libthai-devel >= 0.1.9}
-BuildRequires: meson >= 0.54.0
+BuildRequires: meson >= 0.55.3
 BuildRequires: ninja >= 1.5
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: python-modules
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 %{?with_sysprof:BuildRequires: sysprof-devel >= 3.38}
 BuildRequires: tar >= 1:1.22
@@ -48,7 +49,7 @@ Requires:     cairo >= 1.12.10
 Requires:      fontconfig-libs >= 1:2.12.92
 Requires:      freetype >= 2.1.7
 Requires:      fribidi >= 0.19.7
-Requires:      glib2 >= 1:2.60.0
+Requires:      glib2 >= 1:2.62.0
 Requires:      harfbuzz >= 2.6.0
 Obsoletes:     libpango24
 Obsoletes:     pango-modules < 1:1.38.0-1
@@ -90,7 +91,7 @@ Requires:     cairo-devel >= 1.12.10
 Requires:      fontconfig-devel >= 1:2.12.92
 Requires:      freetype-devel >= 2.1.7
 Requires:      fribidi-devel >= 0.19.7
-Requires:      glib2-devel >= 1:2.60.0
+Requires:      glib2-devel >= 1:2.62.0
 Requires:      harfbuzz-devel >= 2.6.0
 %{?with_libthai:Requires:      libthai-devel >= 0.1.9}
 Requires:      xorg-lib-libX11-devel
@@ -140,7 +141,7 @@ Summary:    Pango API documentation
 Summary(pl.UTF-8):     Dokumentacja API pango
 Group:         Documentation
 Requires:      gtk-doc-common
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description apidocs
 Pango API documentation.
@@ -152,7 +153,7 @@ Dokumentacja API pango.
 Summary:       pango - example programs
 Summary(pl.UTF-8):     pango - przykładowe programy
 Group:         X11/Development/Libraries
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description examples
 pango - example programs.
@@ -176,6 +177,10 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %ninja_install -C build
 
+# FIXME: where to package gi-docgen generated docs?
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/pango/reference/* $RPM_BUILD_ROOT%{_gtkdocdir}
+
 cp examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
@@ -238,7 +243,12 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/pango
+%{_gtkdocdir}/Pango
+%{_gtkdocdir}/PangoCairo
+%{_gtkdocdir}/PangoFT2
+%{_gtkdocdir}/PangoFc
+%{_gtkdocdir}/PangoOT
+%{_gtkdocdir}/PangoXft
 %endif
 
 %files examples