- adjust sr@ijekavian locale dir

- drop old Conflicts related to sr@Latn->sr@latin rename, dependency on locale dir will suffice
- release 2

diff --git a/glib2.spec b/glib2.spec
index eb6cad34ed6fa433998fcb091ba00d555132c5d7..de7689e5b7e311a5c35ac580f6471d89e455ea27 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -20,7 +20,7 @@ Summary(tr.UTF-8):    Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 Name:          glib2
 Version:       2.60.3
-Release:       1
+Release:       2
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
@@ -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