- fix systemtap/tapse install dir on ix86

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 3bddaf9e3ee8543e2fa6af52600a3ad015ceddfd..939df078e1253edd8338fd8a87d924e9721a238d 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -19,23 +19,26 @@ Summary(pt_BR.UTF-8):       Conjunto de funções gráficas utilitárias
 Summary(tr.UTF-8):     Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 Name:          glib2
-Version:       2.54.1
-Release:       1
+Version:       2.56.2
+Release:       2
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.54/glib-%{version}.tar.xz
-# Source0-md5: f8903002421c44dc6e5b5baab8066f1f
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.56/glib-%{version}.tar.xz
+# Source0-md5: 568b6b872d088ac9593b7a8d740812b4
 Patch0:                %{name}-makefile.patch
 URL:           http://www.gtk.org/
 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
@@ -255,6 +258,9 @@ echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
        CPPFLAGS="%{rpmcppflags} -Wall" \
        --enable-debug=%{?debug:yes} \
        %{!?with_systemtap:--disable-dtrace} \
+%ifarch %{ix86}
+       %{?with_systemtap:--with-tapset-install-dir=%{_datadir}/systemtap/tapset/i386} \
+%endif
        %{__enable_disable apidocs gtk-doc} \
        %{__enable_disable selinux} \
        --disable-silent-rules \
@@ -263,6 +269,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
@@ -423,7 +431,7 @@ umask 022
 %if %{with systemtap}
 %files -n systemtap-glib2
 %defattr(644,root,root,755)
-%{_datadir}/systemtap/tapset/libgio-2.0*.stp
-%{_datadir}/systemtap/tapset/libglib-2.0*.stp
-%{_datadir}/systemtap/tapset/libgobject-2.0*.stp
+%{_datadir}/systemtap/tapset/*/libgio-2.0*.stp
+%{_datadir}/systemtap/tapset/*/libglib-2.0*.stp
+%{_datadir}/systemtap/tapset/*/libgobject-2.0*.stp
 %endif