up to 2.58.1

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index da0f6e9d6f8e69220969726253f2f7de67891c5d..be352a2552bdced4d31deda7a5aab6b881eb1561 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.0
+Version:       2.58.1
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.54/glib-%{version}.tar.xz
-# Source0-md5: 6e4db71816ccbc8dabf0e58fa7228e76
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.58/glib-%{version}.tar.xz
+# Source0-md5: 4fd2ead128a408c89b9153dfdb99f9a5
 Patch0:                %{name}-makefile.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.62
-BuildRequires: automake >= 1:1.11
+BuildRequires: automake >= 1:1.13.3
 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
@@ -44,13 +47,13 @@ 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
+BuildRequires: pcre-devel >= 8.31
 BuildRequires: perl-base
 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,7 +64,7 @@ BuildRequires:        xz
 BuildRequires: zlib-devel
 Requires:      iconv
 Requires:      libmount >= 2.28
-Requires:      pcre >= 8.13
+Requires:      pcre >= 8.31
 Suggests:      gvfs
 Provides:      glib2-libs
 Obsoletes:     glib2-libs
@@ -127,7 +130,7 @@ 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:      pcre-devel >= 8.31
 Requires:      python-modules
 # gio only
 %{?with_selinux:Requires:      libselinux-devel}
@@ -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
@@ -304,6 +312,7 @@ umask 022
 %attr(755,root,root) %{_bindir}/gapplication
 %attr(755,root,root) %{_bindir}/gdbus
 %attr(755,root,root) %{_bindir}/gio
+%attr(755,root,root) %{_bindir}/gio-launch-desktop
 %attr(755,root,root) %{_bindir}/gio-querymodules
 %attr(755,root,root) %{_bindir}/glib-compile-schemas
 %attr(755,root,root) %{_bindir}/gsettings
@@ -335,7 +344,6 @@ umask 022
 
 %files devel
 %defattr(644,root,root,755)
-%doc ChangeLog
 %attr(755,root,root) %{_bindir}/gdbus-codegen
 %attr(755,root,root) %{_bindir}/glib-compile-resources
 %attr(755,root,root) %{_bindir}/glib-genmarshal
@@ -417,13 +425,14 @@ umask 022
 %defattr(644,root,root,755)
 %{_datadir}/bash-completion/completions/gapplication
 %{_datadir}/bash-completion/completions/gdbus
+%{_datadir}/bash-completion/completions/gio
 %{_datadir}/bash-completion/completions/gresource
 %{_datadir}/bash-completion/completions/gsettings
 
 %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