SPECS: gcc.spec - multilib obsoletes libgcc32; rel .3

[glen]

Author: glen                         Date: Fri Feb 27 11:28:57 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- multilib obsoletes libgcc32; rel .3

---- Files affected:
SPECS:
   gcc.spec (1.564 -> 1.565) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.564 SPECS/gcc.spec:1.565
--- SPECS/gcc.spec:1.564	Wed Feb 25 23:12:28 2009
+++ SPECS/gcc.spec	Fri Feb 27 12:28:51 2009
@@ -45,8 +45,9 @@
 %undefine	with_multilib
 %endif
 
-%define		_major_ver	4.4
-%define		_minor_ver	0
+%define		major_ver	4.4
+%define		minor_ver	0
+%define		snap	20090123
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 49.0
 
@@ -55,17 +56,16 @@
 Summary(pl.UTF-8):	Kolekcja kompilatorów GNU: kompilator C i pliki współdzielone
 Summary(pt_BR.UTF-8):	Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:		gcc
-Version:	%{_major_ver}.%{_minor_ver}
-%define		_snap	20090123
-Release:	0.%{_snap}.2
+Version:	%{major_ver}.%{minor_ver}
+Release:	0.%{snap}.3
 Epoch:		6
 License:	GPL v3+
 Group:		Development/Languages
 #Source0:	ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2
-Source0:	ftp://gcc.gnu.org/pub/gcc/snapshots/%{_major_ver}-%{_snap}/%{name}-%{_major_ver}-%{_snap}.tar.bz2
+Source0:	ftp://gcc.gnu.org/pub/gcc/snapshots/%{major_ver}-%{snap}/%{name}-%{major_ver}-%{snap}.tar.bz2
 # NoSource0-md5:	fa549ab44088d2d6db4b26119af1a80a
 Source1:	%{name}-optimize-la.pl
-#Source2:	ftp://sourceware.org/pub/java/ecj-%{_major_ver}.jar
+#Source2:	ftp://sourceware.org/pub/java/ecj-%{major_ver}.jar
 Source2:	ftp://sourceware.org/pub/java/ecj-latest.jar
 # Source2-md5:	fd299f26c02268878b5d6c0e86f57c43
 Patch100:	%{name}-branch.diff.bz2
@@ -207,6 +207,7 @@
 Requires:	%{name}
 Requires:	libgcc-multilib = %{epoch}:%{version}-%{release}
 %{?with_multilib:Provides:      gcc(multilib)}
+Obsoletes:	libgcc32
 %ifarch %{x8664}
 Requires:	glibc-devel(i686)
 %endif
@@ -988,8 +989,8 @@
 Requires:	libgcj-devel = %{epoch}:%{version}-%{release}
 Provides:	gcc-java-tools
 Provides:	gcj = %{epoch}:%{version}-%{release}
-Obsoletes:	gcc-java-tools
 Obsoletes:	eclipse-ecj
+Obsoletes:	gcc-java-tools
 
 %description java
 This package adds experimental support for compiling Java(TM) programs
@@ -1362,7 +1363,7 @@
 Statyczne biblioteki Obiektowego C.
 
 %prep
-%setup -q -n gcc-%{_major_ver}-%{_snap}
+%setup -q -n gcc-%{major_ver}-%{snap}
 #patch100 -p0
 %patch0 -p1
 %patch1 -p1
@@ -2164,7 +2165,7 @@
 %attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so
 %{_libdir}/lib-gnu-awt-xlib.la
 %endif
-%{_pkgconfigdir}/libgcj-%{_major_ver}.pc
+%{_pkgconfigdir}/libgcj-%{major_ver}.pc
 
 %files -n libgcj-static
 %defattr(644,root,root,755)
@@ -2262,6 +2263,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.565  2009/02/27 11:28:51  glen
+- multilib obsoletes libgcc32; rel .3
+
 Revision 1.564  2009/02/25 22:12:28  baggins
 - gcc-fortran requires exact gcc, or you'll get this:
   i686-pld-linux-gfortran: error trying to exec 'cc1': execvp: No such file or directory
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gcc.spec?r1=1.564&r2=1.565&f=u