From: ankry <ankry@pld-linux.org>
Date: Sun, 4 Nov 2007 23:22:29 +0000 (+0000)
Subject: - sr@Latn -> sr@latin, rel. 2
X-Git-Tag: auto/th/gnome-applets-2_20_0-2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fgnome-applets-2_20_0-2;p=packages%2Fgnome-applets.git

- sr@Latn -> sr@latin, rel. 2

Changed files:
    gnome-applets.spec -> 1.195
---

diff --git a/gnome-applets.spec b/gnome-applets.spec
index e418816..44e4603 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,7 +4,7 @@ Summary(ru.UTF-8):	Маленькие программы, встраивающи
 Summary(uk.UTF-8):	Маленькі програми, що вбудовуються в панель GNOME
 Name:		gnome-applets
 Version:	2.20.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2, FDL
 Group:		X11/Applications
@@ -56,6 +56,8 @@ Requires:	gnome-panel >= 2.19.6
 Requires:	gnome-vfs2 >= 2.19.91
 Requires:	hicolor-icon-theme
 Requires:	libgnomeui >= 2.19.1
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_gnomehelpdir	%{_datadir}/gnome/help
@@ -362,9 +364,11 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/invest/*.py
+
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/es{_ES,}/LC_MESSAGES/*.mo
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/es_ES
-
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name}-2.0
 %find_lang accessx-status --with-gnome
 %find_lang battstat --with-gnome