- fix systemtap/tapse install dir on ix86

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 3cb61b458500136f8e722656681dd592a25652d9..939df078e1253edd8338fd8a87d924e9721a238d 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -19,30 +19,32 @@ 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.48.0
-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.48/glib-%{version}.tar.xz
-# Source0-md5: 093a586f37d2853bdb129231e1b350e0
-# https://bugzilla.gnome.org/show_bug.cgi?id=763821
-Source1:       gobject.stp.in
+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
 %endif
 BuildRequires: libffi-devel >= 3.0.0
+BuildRequires: libmount-devel >= 2.28
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool >= 2:2.2
 BuildRequires: pcre-devel >= 8.13
@@ -51,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
@@ -61,6 +63,7 @@ BuildRequires:        tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: zlib-devel
 Requires:      iconv
+Requires:      libmount >= 2.28
 Requires:      pcre >= 8.13
 Suggests:      gvfs
 Provides:      glib2-libs
@@ -125,6 +128,8 @@ Summary(pl.UTF-8):  Pliki nagłówkowe i dokumentacja do GLib
 Summary(pt_BR.UTF-8):  Conjunto de ferramentas e biblioteca do kit de desenho do GIMP
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      libffi-devel >= 3.0.0
+Requires:      libmount-devel >= 2.28
 Requires:      pcre-devel >= 8.13
 Requires:      python-modules
 # gio only
@@ -234,8 +239,6 @@ Sondy systemtap/dtrace dla GLib 2.
 %setup -q -n glib-%{version}
 %patch0 -p1
 
-cp %{SOURCE1} gobject/
-
 %if %{without apidocs}
 %{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am
 %{__sed} -e '/^docs.*Makefile$/d' -i configure.ac
@@ -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
@@ -303,6 +311,7 @@ umask 022
 %doc AUTHORS README NEWS
 %attr(755,root,root) %{_bindir}/gapplication
 %attr(755,root,root) %{_bindir}/gdbus
+%attr(755,root,root) %{_bindir}/gio
 %attr(755,root,root) %{_bindir}/gio-querymodules
 %attr(755,root,root) %{_bindir}/glib-compile-schemas
 %attr(755,root,root) %{_bindir}/gsettings
@@ -326,6 +335,7 @@ umask 022
 %if %{with apidocs}
 %{_mandir}/man1/gapplication.1*
 %{_mandir}/man1/gdbus.1*
+%{_mandir}/man1/gio.1*
 %{_mandir}/man1/gio-querymodules.1*
 %{_mandir}/man1/glib-compile-schemas.1*
 %{_mandir}/man1/gsettings.1*
@@ -356,6 +366,7 @@ umask 022
 %dir %{_datadir}/glib-2.0/gettext
 %{_datadir}/glib-2.0/gettext/po
 %{_datadir}/glib-2.0/schemas/gschema.dtd
+%{_datadir}/glib-2.0/valgrind
 %{_datadir}/gettext/its/gschema.its
 %{_datadir}/gettext/its/gschema.loc
 %{_libdir}/libgio-2.0.la
@@ -420,6 +431,7 @@ umask 022
 %if %{with systemtap}
 %files -n systemtap-glib2
 %defattr(644,root,root,755)
-%{_datadir}/systemtap/tapset/glib.stp
-%{_datadir}/systemtap/tapset/gobject.stp
+%{_datadir}/systemtap/tapset/*/libgio-2.0*.stp
+%{_datadir}/systemtap/tapset/*/libglib-2.0*.stp
+%{_datadir}/systemtap/tapset/*/libgobject-2.0*.stp
 %endif