up to 2.62.2

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index eb6cad34ed6fa433998fcb091ba00d555132c5d7..19f89076221781bf245491e3fa28d6952d3fceb6 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -19,13 +19,13 @@ 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.60.3
+Version:       2.62.2
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.60/glib-%{version}.tar.xz
-# Source0-md5: 112a850caa8d2c21e24d4c9844e8b1fe
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.62/glib-%{version}.tar.xz
+# Source0-md5: bed3a70397a019965efac0c49f9c8164
 URL:           http://www.gtk.org/
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-dtd45-xml
@@ -38,13 +38,12 @@ 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: meson >= 0.48.0
-BuildRequires: ninja
+BuildRequires: meson >= 0.49.2
+BuildRequires: ninja >= 1.5
 BuildRequires: pcre-devel >= 8.31
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.16
@@ -66,8 +65,6 @@ Requires:     pcre >= 8.31
 Suggests:      gvfs
 Provides:      glib2-libs
 Obsoletes:     glib2-libs
-# sr@Latn vs. sr@latin
-Conflicts:     glibc-misc < 6:2.7
 # see https://bugzilla.xfce.org/show_bug.cgi?id=9709
 Conflicts:     xfce4-session < 4.10.0-5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -264,6 +261,9 @@ rm -rf $RPM_BUILD_ROOT
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb
 %py_postclean $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb
 
+# adjust for compatibility with names supported by glibc
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
+
 %find_lang glib20
 
 %clean