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

Changed files:
    gdm.spec -> 1.216
    gdm2.20.spec -> 1.216

diff --git a/gdm.spec b/gdm.spec
index acf4ba799831e7a0dbbbeac5ff8fe22c2ef8d4ca..e2f26b09de313b36ac9addd9c07c0fe31127fdb5 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@ Summary(ru.UTF-8):    Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
 Version:       2.20.0
-Release:       4
+Release:       5
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
@@ -75,6 +75,8 @@ Provides:     XDM
 Provides:      group(xdm)
 Provides:      user(xdm)
 Conflicts:     gdkxft
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _localstatedir  /var/lib
@@ -192,6 +194,8 @@ install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --all-name --with-gnome
 
 # Remove useless files

diff --git a/gdm2.20.spec b/gdm2.20.spec
index acf4ba799831e7a0dbbbeac5ff8fe22c2ef8d4ca..e2f26b09de313b36ac9addd9c07c0fe31127fdb5 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -16,7 +16,7 @@ Summary(ru.UTF-8):    Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
 Version:       2.20.0
-Release:       4
+Release:       5
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
@@ -75,6 +75,8 @@ Provides:     XDM
 Provides:      group(xdm)
 Provides:      user(xdm)
 Conflicts:     gdkxft
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _localstatedir  /var/lib
@@ -192,6 +194,8 @@ install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --all-name --with-gnome
 
 # Remove useless files