SPECS: glib2.spec - release 4

[glen]

Author: glen                         Date: Mon Mar 31 19:32:29 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 4

---- Files affected:
SPECS:
   glib2.spec (1.178 -> 1.179) 

---- Diffs:

================================================================
Index: SPECS/glib2.spec
diff -u SPECS/glib2.spec:1.178 SPECS/glib2.spec:1.179
--- SPECS/glib2.spec:1.178	Mon Mar 31 21:29:32 2008
+++ SPECS/glib2.spec	Mon Mar 31 21:32:24 2008
@@ -23,7 +23,7 @@
 Summary(zh_CN.UTF-8):	实用工具函数库
 Name:		glib2
 Version:	2.16.1
-Release:	3
+Release:	4
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
@@ -52,6 +52,8 @@
 Requires:	pcre >= 7.6
 Provides:	glib2-libs
 Obsoletes:	glib2-libs
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -206,6 +208,8 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.{la,a}
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang glib20
 
 %clean
@@ -298,6 +302,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.179  2008-03-31 19:32:24  glen
+- release 4
+
 Revision 1.178  2008-03-31 19:29:32  glen
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glib2.spec?r1=1.178&r2=1.179&f=u