[packages/glib2] - package also gvariant docs from rst2html5

qboosh qboosh at pld-linux.org
Sat Apr 22 17:44:29 CEST 2023


commit 4fcb14859bf72c0867a0fe59691e43f00ef3c9c8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 22 17:47:06 2023 +0200

    - package also gvariant docs from rst2html5

 glib2.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/glib2.spec b/glib2.spec
index 76b3321..7b8cf76 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,6 +1,5 @@
 # TODO: 
 # - use -Dmultiarch for arch-dependent binaries? (like gio-querymodules or gio-launch-desktop)
-# - docutils >= 0.13.1 (rst2html5) based gvariant docs
 #
 # Conditional build:
 %bcond_without	apidocs		# gtk-doc based API documentation
@@ -41,9 +40,6 @@ BuildRequires:	gettext-tools
 %if %(locale -a | grep -q '^C\.utf8$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
-%if %{with apidocs}
-BuildRequires:	gtk-doc >= 1.32.1
-%endif
 BuildRequires:	libffi-devel >= 3.0.0
 BuildRequires:	libmount-devel >= 2.28
 %{?with_selinux:BuildRequires:	libselinux-devel >= 2.2}
@@ -69,6 +65,10 @@ BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRequires:	zlib-devel
+%if %{with apidocs}
+BuildRequires:	docutils >= 0.13.1
+BuildRequires:	gtk-doc >= 1.32.1
+%endif
 Requires:	iconv
 Requires:	libmount >= 2.28
 %{?with_selinux:Requires:	libselinux >= 2.2}
@@ -265,6 +265,11 @@ install -d $RPM_BUILD_ROOT%{_libdir}/gio/modules
 
 %ninja_install -C build
 
+%if %{with apidocs}
+# gvariant documentation (generated by rst2html5)
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/glib-2.0 $RPM_BUILD_ROOT%{_gtkdocdir}
+%endif
+
 > $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
 > $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/gschemas.compiled
 
@@ -386,6 +391,7 @@ umask 022
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gio
 %{_gtkdocdir}/glib
+%{_gtkdocdir}/glib-2.0
 %{_gtkdocdir}/gobject
 %endif
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glib2.git/commitdiff/4fcb14859bf72c0867a0fe59691e43f00ef3c9c8



More information about the pld-cvs-commit mailing list