SPECS: glibc.spec - cleaned up and simplified lang()ed files gener...

[qboosh]

Author: qboosh                       Date: Sun Jan  6 13:56:16 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleaned up and simplified lang()ed files generation

---- Files affected:
SPECS:
   glibc.spec (1.743 -> 1.744) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.743 SPECS/glibc.spec:1.744
--- SPECS/glibc.spec:1.743	Sun Jan  6 14:28:07 2008
+++ SPECS/glibc.spec	Sun Jan  6 14:56:10 2008
@@ -1047,25 +1047,10 @@
 # Collect locale files and mark them with %%lang()
 rm -f glibc.lang
 echo '%defattr(644,root,root,755)' > glibc.lang
-for i in $RPM_BUILD_ROOT%{_datadir}/locale/* $RPM_BUILD_ROOT%{_libdir}/locale/* ; do
+for i in $RPM_BUILD_ROOT%{_datadir}/locale/* ; do
 	if [ -d $i ]; then
-		lang=`echo $i | sed -e 's/.*locale\///' -e 's/\/.*//'`
-		twochar=1
-		# list of long %%lang values we do support
-		for j in de_AT de_BE de_CH de_LU es_AR es_MX pt_BR \
-			 zh_CN zh_CN.gbk zh_HK zh_TW ; do
-			if [ $j = "$lang" ]; then
-				twochar=
-			fi
-		done
-		if [ -n "$twochar" ]; then
-			if [ `echo $lang | sed "s,_.*,,"` = "zh" ]; then
-				lang=`echo $lang | sed "s,\..*,,"`
-			else
-				lang=`echo $lang | sed "s,_.*,,"`
-			fi
-		fi
-		dir=`echo $i | sed "s#$RPM_BUILD_ROOT##"`
+		lang=$(basename $i)
+		dir="${i#$RPM_BUILD_ROOT}"
 		echo "%lang($lang) $dir" >> glibc.lang
 	fi
 done
@@ -1101,7 +1086,8 @@
     wo xh yi yo zh_HK zu ; do
 	if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES ]; then
 		install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES
-		lang=`echo $i | sed -e 's/_.*//'`
+		# use lang() tags with ll_CC at variant (stripping charset and @quot|@boldquot)
+		lang=`echo $i | sed -e 's/@quot\>\|@boldquot\>//'`
 		echo "%lang($lang) %{_datadir}/locale/$i" >> glibc.lang
 	fi
 done
@@ -1191,7 +1177,7 @@
 %if !%{with cross}
 %attr(755,root,root) /sbin/glibc-postinst
 %endif
-# ld-*.so SONAME is:
+# ld*.so SONAME is:
 #   ld.so.1 on ppc
 #   ld64.so.1 on ppc64,s390x
 #   ld-linux-ia64.so.2 on ia64
@@ -1556,6 +1542,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.744  2008-01-06 13:56:10  qboosh
+- cleaned up and simplified lang()ed files generation
+
 Revision 1.743  2008-01-06 13:28:07  qboosh
 - package dirs for LC_TIME category locale catalogs
 - moved ldconfig(8) manuals to ldconfig package
================================================================

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