up to 2.62.0

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 88ca2b35ce19f9e3ec28fd34d970928c0d3d74e5..01d43e5569f0052d086709994c048ecde2d4cbd1 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.0
+Version:       2.62.0
 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: 7d36520dda58de65027abf5b4fb1241a
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.62/glib-%{version}.tar.xz
+# Source0-md5: a5d34752dd3a6c8d929ade7debc4db03
 URL:           http://www.gtk.org/
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-dtd45-xml
@@ -43,7 +43,7 @@ BuildRequires:        gtk-doc-automake >= 1.20
 BuildRequires: libffi-devel >= 3.0.0
 BuildRequires: libmount-devel >= 2.28
 %{?with_selinux:BuildRequires: libselinux-devel}
-BuildRequires: meson >= 0.48.0
+BuildRequires: meson >= 0.49.2
 BuildRequires: ninja
 BuildRequires: pcre-devel >= 8.31
 BuildRequires: perl-base
@@ -66,8 +66,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 +262,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