SPECS (AC-branch): gcc4.spec - do not let locale files collide wit...

[glen]

Author: glen                         Date: Fri Feb 15 03:44:33 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- do not let locale files collide with gcc package

---- Files affected:
SPECS:
   gcc4.spec (1.438.2.19 -> 1.438.2.20) 

---- Diffs:

================================================================
Index: SPECS/gcc4.spec
diff -u SPECS/gcc4.spec:1.438.2.19 SPECS/gcc4.spec:1.438.2.20
--- SPECS/gcc4.spec:1.438.2.19	Fri Feb 15 02:21:11 2008
+++ SPECS/gcc4.spec	Fri Feb 15 04:44:28 2008
@@ -21,7 +21,7 @@
 Summary(pt_BR):	Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:		%{sname}4
 Version:	4.1.2
-Release:	8
+Release:	9
 Epoch:		5
 License:	GPL v2+
 Group:		Development/Languages
@@ -429,12 +429,18 @@
 # but we don't want anything more from install-tools
 rm -rf $gccdir/install-tools
 
-%find_lang gcc
-%find_lang cpplib
-cat cpplib.lang >> gcc.lang
+for a in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/*.mo; do
+	d=${a%/*} # dirname
+	n=${a##*/} # basename
+	mv $a $d/${n%.mo}4.mo
+done
+
+%find_lang gcc4
+%find_lang cpplib4
+cat cpplib4.lang >> gcc4.lang
 
 %if %{with cxx}
-%find_lang libstdc\+\+
+%find_lang libstdc\+\+4
 install libstdc++-v3/include/stdc++.h $RPM_BUILD_ROOT%{_includedir}
 %endif
 
@@ -484,7 +490,7 @@
 %post	-p /sbin/ldconfig -n libstdc++4
 %postun	-p /sbin/ldconfig -n libstdc++4
 
-%files -f gcc.lang
+%files -f gcc4.lang
 %defattr(644,root,root,755)
 %doc ChangeLog.general MAINTAINERS NEWS
 # bugs.html faq.html
@@ -544,7 +550,7 @@
 %{_libdir}/libsupc++.la
 %{_mandir}/man1/g++4.1*
 
-%files -n libstdc++4 -f libstdc++.lang
+%files -n libstdc++4 -f libstdc++4.lang
 %defattr(644,root,root,755)
 %doc libstdc++-v3/{ChangeLog,README}
 %attr(755,root,root) %{_libdir}/libstdc++.so.*.*.*
@@ -570,6 +576,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.438.2.20  2008-02-15 03:44:28  glen
+- do not let locale files collide with gcc package
+
 Revision 1.438.2.19  2008-02-15 01:21:11  glen
 - does not provide cpp (but cpp4); rel 8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gcc4.spec?r1=1.438.2.19&r2=1.438.2.20&f=u