[packages/glib2] - adjust sr at ijekavian locale dir - drop old Conflicts related to sr at Latn->sr at latin rename, dependenc

qboosh qboosh at pld-linux.org
Sat May 25 18:37:35 CEST 2019


commit cb3197536149c4e1f3da38ee65b8a158b158e0ee
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 25 18:38:23 2019 +0200

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

 glib2.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/glib2.spec b/glib2.spec
index eb6cad3..de7689e 100644
--- 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 at Latn vs. sr at 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 at ije,sr at ijekavian}
+
 %find_lang glib20
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glib2.git/commitdiff/cb3197536149c4e1f3da38ee65b8a158b158e0ee



More information about the pld-cvs-commit mailing list