SPECS: glibc.spec - revert sr at Latn; too many pain. First other app...

arekm arekm at pld-linux.org
Sat Nov 3 11:54:26 CET 2007


Author: arekm                        Date: Sat Nov  3 10:54:26 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revert sr at Latn; too many pain. First other apps need to be fixed THEN glibc.

---- Files affected:
SPECS:
   glibc.spec (1.736 -> 1.737) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.736 SPECS/glibc.spec:1.737
--- SPECS/glibc.spec:1.736	Sat Nov  3 00:12:52 2007
+++ SPECS/glibc.spec	Sat Nov  3 11:54:21 2007
@@ -1055,7 +1055,7 @@
     eo es_AR es_CO es_MX es_NI es_PR et eu fa fil fo fr_BE fur fy ga gd gez \
     gu gv he hi hsb hy ia id ik is it_CH iu ka kk kl km kn ku kw ky lg li lo \
     lt lv mai mg mi mk ml mn mr ms mt nds ne nl_BE nn nr nso oc om or pa pap \
-    pt rm ro sa sc se si sid sl so sq sr sr at ije sr at latin ss st sw ta \
+    pt rm ro sa sc se si sid sl so sq sr sr at Latn sr at ije sr at latin ss st sw ta \
     te tg th ti tig tk tl tlh tn ts tt ug uk ur uz uz at cyrillic ve vi wa wal \
     wo xh yi yo zh_HK zu ; do
 	if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES ]; then
@@ -1065,9 +1065,6 @@
 	fi
 done
 
-# will it work ?
-ln -s sr at latin $RPM_BUILD_ROOT%{_datadir}/locale/sr at Latn
-
 # localedb-gen infrastructure
 sed -e 's, at localedir@,%{_libdir}/locale,' %{SOURCE6} > $RPM_BUILD_ROOT%{_bindir}/localedb-gen
 chmod +x $RPM_BUILD_ROOT%{_bindir}/localedb-gen
@@ -1105,12 +1102,6 @@
 -/bin/sed -i -e '1iinclude ld.so.conf.d/*.conf' /etc/ld.so.conf
 %endif
 
-%pretrans misc
-if [ ! -L %{_datadir}/locale/sr at Latn -a -d %{_datadir}/locale/sr at latin ]; then
-	mv %{_datadir}/locale/sr at Latn/* %{_datadir}/locale/sr at latin/ > /dev/null 2>&1
-	rmdir %{_datadir}/locale/sr at Latn 2>/dev/null || mv -v %{_datadir}/locale/sr at Latn{,.rpmsave}
-fi
-
 %post	memusage -p /sbin/ldconfig
 %postun	memusage -p /sbin/ldconfig
 
@@ -1182,9 +1173,6 @@
 
 %files misc -f %{name}.lang
 %defattr(644,root,root,755)
-# not catched by find_lang due to being symlink
-%lang(sr at latin) %{_datadir}/locale/sr at Latn
-
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nsswitch.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gai.conf
@@ -1499,6 +1487,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.737  2007/11/03 10:54:21  arekm
+- revert sr at Latn; too many pain. First other apps need to be fixed THEN glibc.
+
 Revision 1.736  2007/11/02 23:12:52  hawk
 - added i586 build fix, required for Titanium, allowed on HEAD by arekm
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glibc.spec?r1=1.736&r2=1.737&f=u



More information about the pld-cvs-commit mailing list