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

Changed files:
    gnome-keyring.spec -> 1.49

diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index e1cb410d3baaac2744c8c71a2cc4665ca2adf581..d7ccc9effb2b639da6260f63a4a0a77445fc6ce1 100644 (file)
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -2,7 +2,7 @@ Summary:        Keep passwords and other user's secrets
 Summary(pl.UTF-8):     Przechowywanie haseł i innych tajnych danych użytkowników
 Name:          gnome-keyring
 Version:       2.20.1
-Release:       1
+Release:       2
 License:       LGPL v2+/GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.20/%{name}-%{version}.tar.bz2
@@ -22,6 +22,8 @@ BuildRequires:        pam-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 Requires:      dbus >= 1.1.2
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -131,6 +133,8 @@ rm -rf $RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
 rm -f $RPM_BUILD_ROOT%{_libdir}/pam_gnome_keyring*
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --with-gnome --all-name
 
 %clean