SPECS: gnome-utils.spec - sr at Latn -> sr at latin, rel. 4

[ankry]

Author: ankry                        Date: Sun Nov  4 23:56:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sr at Latn -> sr at latin, rel. 4

---- Files affected:
SPECS:
   gnome-utils.spec (1.154 -> 1.155) 

---- Diffs:

================================================================
Index: SPECS/gnome-utils.spec
diff -u SPECS/gnome-utils.spec:1.154 SPECS/gnome-utils.spec:1.155
--- SPECS/gnome-utils.spec:1.154	Thu Sep 20 15:59:29 2007
+++ SPECS/gnome-utils.spec	Mon Nov  5 00:56:15 2007
@@ -7,7 +7,7 @@
 Summary(zh_CN.UTF-8):	GNOME应用程序集
 Name:		gnome-utils
 Version:	2.20.0
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL v2
 Group:		X11/Applications
@@ -44,6 +44,8 @@
 Requires:	libgnomeui >= 2.18.1
 Obsoletes:	gnome
 Obsoletes:	gnome-admin
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_gnomehelpdir	%{_datadir}/gnome/help
@@ -244,6 +246,8 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name}-2.0
 %find_lang baobab --with-gnome
 %find_lang gfloppy --with-gnome
@@ -460,6 +464,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.155  2007/11/04 23:56:15  ankry
+- sr at Latn -> sr at latin, rel. 4
+
 Revision 1.154  2007/09/20 13:59:29  baggins
 - rel 3
 - there is no such thing as hicolor-icon-theme 2.20.0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-utils.spec?r1=1.154&r2=1.155&f=u