SPECS: gcc.spec - disable multlib build ( broken ), fix %files.

[pluto]

Author: pluto                        Date: Sun Oct 22 13:29:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- disable multlib build ( broken ), fix %files.

---- Files affected:
SPECS:
   gcc.spec (1.420 -> 1.421) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.420 SPECS/gcc.spec:1.421
--- SPECS/gcc.spec:1.420	Sat Oct 21 20:56:38 2006
+++ SPECS/gcc.spec	Sun Oct 22 15:29:05 2006
@@ -26,7 +26,7 @@
 %bcond_without	java		# build without Java support
 %bcond_without	objc		# build without Objective-C support
 %bcond_without	objcxx		# build without Objective-C++ support
-%bcond_without	multilib	# build without multilib support (it needs glibc[32&64]-devel)
+%bcond_with	multilib	# build with multilib support (it needs glibc[32&64]-devel)
 %bcond_with	profiling	# build with profiling
 %bcond_without	bootstrap	# omit 3-stage bootstrap
 %bcond_with	tests		# torture gcc
@@ -53,7 +53,9 @@
 Summary(pl):	Kolekcja kompilatorów GNU: kompilator C i pliki współdzielone
 Summary(pt_BR):	Coleçăo dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:		gcc
-Version:	4.2.0
+%define		_major_ver	4.2
+%define		_minor_ver	0
+Version:	%{_major_ver}.%{_minor_ver}
 %define		_snap	20061021r117925
 Release:	0.%{_snap}.1
 #Release:	2
@@ -934,7 +936,7 @@
 # normalize libdir, to avoid propagation of unnecessary RPATHs by libtool
 for f in libgomp.la libmudflap.la libmudflapth.la libssp.la libssp_nonshared.la \
 	%{?with_cxx:libstdc++.la libsupc++.la} \
-	%{?with_fortran:libgfortran.la libgfortranbegin.la} \
+	%{?with_fortran:libgfortran.la} \
 %if %{with java}
 	libgcj.la libgcj-tools.la libffi.la lib-gnu-awt-xlib.la \
 	gcj-%{version}/libgtkpeer.la gcj-%{version}/libjawt.la gcj-%{version}/libjvm.la gcj-%{version}/libqtpeer.la \
@@ -948,7 +950,7 @@
 %if %{with multilib}
 for f in libgomp.la libmudflap.la libmudflapth.la libssp.la libssp_nonshared.la \
 	%{?with_cxx:libstdc++.la libsupc++.la} \
-	%{?with_fortran:libgfortran.la libgfortranbegin.la} \
+	%{?with_fortran:libgfortran.la} \
 	%{?with_java:libffi.la} \
 	%{?with_objc:libobjc.la};
 do
@@ -1233,14 +1235,12 @@
 %attr(755,root,root) %{_bindir}/*-gfortran
 %{_infodir}/gfortran*
 %attr(755,root,root) %{_libdir}/gcc/*/*/f951
+%{_libdir}/gcc/*/*/libgfortranbegin.a
 %if %{with multilib}
-%{_libdir32}/libgfortranbegin.a
-%{_libdir32}/libgfortranbegin.la
+%{_libdir}/gcc/*/*/32/libgfortranbegin.a
 %{_libdir32}/libgfortran.la
 %attr(755,root,root) %{_libdir32}/libgfortran.so
 %endif
-%{_libdir}/libgfortranbegin.a
-%{_libdir}/libgfortranbegin.la
 %{_libdir}/libgfortran.la
 %attr(755,root,root) %{_libdir}/libgfortran.so
 %{_mandir}/man1/g95.1*
@@ -1335,7 +1335,7 @@
 %{_libdir}/gcj-%{version}/libjawt.la
 %{_libdir}/gcj-%{version}/libjvm.la
 %{_libdir}/gcj-%{version}/libqtpeer.la
-%{_pkgconfigdir}/libgcj.pc
+%{_pkgconfigdir}/libgcj-%{_major_ver}.pc
 
 %files -n libgcj-static
 %defattr(644,root,root,755)
@@ -1418,6 +1418,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.421  2006/10/22 13:29:05  pluto
+- disable multlib build ( broken ), fix %files.
+
 Revision 1.420  2006/10/21 18:56:38  pluto
 - updated to 4.2.0-20061021 (rev. 117925).
   (4.2 branch created).
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.420&r2=1.421&f=u