SPECS: gdm.spec, gftp.spec - sr at Latn -> sr at latin, rel. 5

[ankry]

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

---- Files affected:
SPECS:
   gdm.spec (1.215 -> 1.216) , gftp.spec (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: SPECS/gdm.spec
diff -u SPECS/gdm.spec:1.215 SPECS/gdm.spec:1.216
--- SPECS/gdm.spec:1.215	Thu Oct 25 18:27:45 2007
+++ SPECS/gdm.spec	Sun Nov  4 23:53:18 2007
@@ -17,7 +17,7 @@
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
 Version:	2.20.0
-Release:	4
+Release:	5
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
@@ -76,6 +76,8 @@
 Provides:	group(xdm)
 Provides:	user(xdm)
 Conflicts:	gdkxft
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_localstatedir	/var/lib
@@ -193,6 +195,8 @@
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --all-name --with-gnome
 
 # Remove useless files
@@ -298,6 +302,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.216  2007/11/04 22:53:18  ankry
+- sr at Latn -> sr at latin, rel. 5
+
 Revision 1.215  2007/10/25 16:27:45  baggins
 - rel 4
 - no need for pam_ck_connector, gdm can do this internally

================================================================
Index: SPECS/gftp.spec
diff -u SPECS/gftp.spec:1.92 SPECS/gftp.spec:1.93
--- SPECS/gftp.spec:1.92	Tue Feb 13 08:16:45 2007
+++ SPECS/gftp.spec	Sun Nov  4 23:53:18 2007
@@ -8,7 +8,7 @@
 Summary(uk.UTF-8):	Багатонитковий FTP клієнт для X Window
 Name:		gftp
 Version:	2.0.18
-Release:	4
+Release:	5
 Epoch:		2
 License:	GPL
 Group:		X11/Applications/Networking
@@ -27,6 +27,8 @@
 BuildRequires:	gtk+2-devel >= 1:2.0.0
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pkgconfig
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -113,6 +115,8 @@
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/gftp{-gtk,}
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --all-name
 
 %clean
@@ -137,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2007/11/04 22:53:18  ankry
+- sr at Latn -> sr at latin, rel. 5
+
 Revision 1.92  2007/02/13 07:16:45  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gdm.spec?r1=1.215&r2=1.216&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gftp.spec?r1=1.92&r2=1.93&f=u