Revert to 4.5.1 snapshot to resolve ecj1 dep on libgcj

Since ecj1 is anyways linked against libgcj, which changes SONAME with
each major.minor series, we can rely on the latter's libgcj-*.jar files
so long as we use the same point release of GCC as well.

2 files changed, 22 insertions, 16 deletions

diff --git a/cygwin-gcc.spec b/cygwin-gcc.spec
index a5a6e4e..a096b33 100644
--- a/cygwin-gcc.spec
+++ b/cygwin-gcc.spec
@@ -1,3 +1,12 @@
+%global DATE 20101118
+%global gcc_major 4
+%global gcc_minor 5
+%global gcc_micro 1
+%global gcc_branch %{gcc_major}.%{gcc_minor}
+%global gcc_version %{gcc_major}.%{gcc_minor}.%{gcc_micro}
+# Note, gcc_release must be integer, if you want to add suffixes to
+# %{release}, append them after %{gcc_release} on Release: line.
+%global gcc_release 1
 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
 %global build_ada 1
 %else
@@ -7,14 +16,14 @@
 %global __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
 Name:           cygwin-gcc
-Version:        4.5.2
-Release:        1%{?dist}
+Version:        %{gcc_version}
+Release:        %{gcc_release}%{?dist}
 Summary:        Cygwin cross-compiler (GCC) for C
 
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
 Group:          Development/Languages
 URL:            http://gcc.gnu.org
-Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
+Source0:        ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_branch}-%{DATE}/gcc-%{gcc_branch}-%{DATE}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  texinfo
@@ -151,7 +160,7 @@ Cygwin cross-compiler for Ada.
 Summary: Cygwin cross-compiler for Java
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-#Requires: gcc-java = %{version}-%{release}
+Requires: libgcj = %{version}
 Requires: cygwin-libiconv
 Requires: cygwin-zlib
 # We don't run the automatic dependency scripts which would
@@ -167,7 +176,7 @@ Cygwin cross-compiler for Java.
 
 
 %prep
-%setup -q -n gcc-%{version}
+%setup -q -n gcc-%{gcc_branch}-%{DATE}
 %patch0 -p1 -b .config-rpath~
 %patch2 -p2 -b .ehdebug~
 %patch4 -p2 -b .libstdc~
@@ -185,7 +194,8 @@ Cygwin cross-compiler for Java.
 %patch11 -p2 -b .awt~
 %endif
 
-echo 'Fedora Cygwin %{version}-%{release}' > gcc/DEV-PHASE
+echo %{gcc_version} > gcc/BASE-VER
+echo 'Fedora Cygwin %{gcc_version}-%{gcc_release}' > gcc/DEV-PHASE
 
 # Install python files into _cygwin_datadir
 sed -i -e '/^pythondir =/ s|$(datadir)|%{_cygwin_datadir}|' libstdc++-v3/python/Makefile.{am,in}
@@ -194,8 +204,6 @@ sed -i -e '/^pythondir =/ s|$(datadir)|%{_cygwin_datadir}|' libstdc++-v3/python/
 # 1) gcc-java does not ship $host-gcj
 # 2) $_host != `gcc -dumpmachine` (e.g. i?86-pc-linux-gnu vs. i686-redhat-linux)
 sed -i -e '/^GCJ_FOR_ECJX =/ s|\@.*\@|gcj|' libjava/Makefile.in
-# make sure libgcj.jar does not collide with native libgcj package
-sed -i -e '/^jardir =/ s|= .*|= $(toolexecmainlibdir)|' libjava/Makefile.in
 %endif
 
 %build
@@ -263,6 +271,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man7/*
 rm -fr $RPM_BUILD_ROOT%{_libdir}/gcj-%{version}-*
 rm -fr $RPM_BUILD_ROOT%{_libdir}/logging.properties
 rm -fr $RPM_BUILD_ROOT%{_libdir}/security/
+rm -f $RPM_BUILD_ROOT%{_datadir}/java/libgcj-*.jar
 rm -f $RPM_BUILD_ROOT%{_datadir}/python/*
 %endif
 
@@ -363,6 +372,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{_cygwin_target}-gcc.1*
 %{_mandir}/man1/%{_cygwin_target}-gcov.1*
 %{_cygwin_datadir}/gcc-%{version}/
+%doc gcc/README* gcc/COPYING*
 
 
 %files -n cygwin-cpp
@@ -453,13 +463,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/include/jvmpi.h
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj.a
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj.dll.a
-%{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj-%{version}.jar
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj-noncore.a
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj-noncore.dll.a
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj.spec
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj-tools.a
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj-tools.dll.a
-%{_libdir}/gcc/%{_cygwin_target}/%{version}/libgcj-tools-%{version}.jar
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgij.a
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libgij.dll.a
 %{_libexecdir}/gcc/%{_cygwin_target}/%{version}/ecj1
@@ -475,5 +483,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 17 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 4.5.1-1
+- Match native gcc version to resolve ecj1 dependency on libgcj.
+
 * Wed Feb 16 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 4.5.2-1
 - Initial RPM release, largely based on mingw32-gcc.
diff --git a/sources b/sources
index bff2d76..a3def18 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-ee24023972f337fbc22202d6d219a727  gcc-ada-4.5.2.tar.bz2
-aa9e36bec080452372bfba793428ee82  gcc-core-4.5.2.tar.bz2
-8cc545fda70085c78076d79e0e23962a  gcc-fortran-4.5.2.tar.bz2
-9821f1c61e43755866861485ff364e90  gcc-g++-4.5.2.tar.bz2
-fe2b647bace18dc7867a4192def46e2c  gcc-java-4.5.2.tar.bz2
-3561c6585e9062105cc3591a8c39d7dc  gcc-objc-4.5.2.tar.bz2
+96e2cdf69519fe9e125304daa8b1120a  gcc-4.5-20101118.tar.bz2