[packages/glib2] - force UTF-8 locale for gtk-doc - adjusted xsl package name (configure refers to non-namespaced URL

qboosh qboosh at pld-linux.org
Sun Nov 26 20:10:58 CET 2017


commit eab94d613e42b5a0e8d0615803b493b9508cfec8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 26 20:11:58 2017 +0100

    - force UTF-8 locale for gtk-doc
    - adjusted xsl package name (configure refers to non-namespaced URL)
    - updated python version

 glib2.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/glib2.spec b/glib2.spec
index c7f1db9..b7e8157 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -32,10 +32,13 @@ BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-dtd45-xml
-BuildRequires:	docbook-style-xsl
+BuildRequires:	docbook-style-xsl-nons
 BuildRequires:	elfutils-devel
 BuildRequires:	fam-devel
 BuildRequires:	gettext-tools
+%if %(locale -a | grep -q '^C-UTF\.8$'; echo $?)
+BuildRequires:	glibc-localedb-all
+%endif
 %if %{with apidocs}
 BuildRequires:	gtk-doc >= 1.20
 BuildRequires:	gtk-doc-automake >= 1.20
@@ -50,7 +53,7 @@ BuildRequires:	pkgconfig >= 1:0.16
 # in case of separate libelf (elfutils don't provide .pc file)
 #BuildRequires:	pkgconfig(libelf) >= 0.8.12
 BuildRequires:	pkgconfig(libffi) >= 3.0.0
-BuildRequires:	python >= 1:2.5
+BuildRequires:	python >= 1:2.7
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.527
@@ -263,6 +266,8 @@ echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
 	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
 	--with-pcre=system
 
+# gtk-doc build requires UTF-8 locale
+LC_ALL=C.UTF-8 \
 %{__make}
 
 %install
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list