cygwin-gcc 4.5.3-1

2 files changed, 31 insertions, 25 deletions

diff --git a/cygwin-gcc.spec b/cygwin-gcc.spec
index 2bb38c2..49f9736 100644
--- a/cygwin-gcc.spec
+++ b/cygwin-gcc.spec
@@ -1,12 +1,11 @@
-%global DATE 20101118
 %global gcc_major 4
 %global gcc_minor 5
-%global gcc_micro 1
+%global gcc_micro 3
 %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 2
+# %%{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
@@ -18,12 +17,12 @@
 Name:           cygwin-gcc
 Version:        %{gcc_version}
 Release:        %{gcc_release}%{?dist}
-Summary:        Cygwin cross-compiler (GCC) for C
+Summary:        Cygwin GCC cross-compiler
 
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
 Group:          Development/Languages
 URL:            http://gcc.gnu.org
-Source0:        ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_branch}-%{DATE}/gcc-%{gcc_branch}-%{DATE}.tar.bz2
+Source0:        ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  texinfo
@@ -54,12 +53,6 @@ Requires:       cygwin-binutils
 Requires:       cygwin
 Requires:       cygwin-w32api
 Requires:       cygwin-cpp
-Requires:       gmp
-Requires:       mpfr
-Requires:       libmpc
-Requires:       ppl
-Requires:       cloog-ppl
-Requires:       zlib
 
 # We don't run the automatic dependency scripts which would
 # normally detect and provide the following DLL:
@@ -160,7 +153,7 @@ Cygwin cross-compiler for Ada.
 Summary: Cygwin cross-compiler for Java
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: libgcj = %{version}
+Requires: ecj
 Requires: cygwin-libiconv
 Requires: cygwin-zlib
 # We don't run the automatic dependency scripts which would
@@ -176,7 +169,7 @@ Cygwin cross-compiler for Java.
 
 
 %prep
-%setup -q -n gcc-%{gcc_branch}-%{DATE}
+%setup -q -n gcc-%{gcc_version}
 %patch0 -p1 -b .config-rpath~
 %patch2 -p2 -b .ehdebug~
 %patch4 -p2 -b .libstdc~
@@ -197,13 +190,19 @@ Cygwin cross-compiler for Java.
 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}
+# Install python files into arch-specific datadir
+sed \
+  -e "s|^\(pythondir = \).*|\1%{_datadir}/gcc/%{_cygwin_target}/%{gcc_version}/python|" \
+  -i libstdc++-v3/python/Makefile.{am,in}
 
 %if %{build_java}
-# 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
+# 1) Install libgcj jar into arch-specific datadir
+# 2) gcc-java does not ship $host-gcj, and $_host != `gcc -dumpmachine`
+#    (e.g. i?86-pc-linux-gnu vs. i686-redhat-linux)
+sed \
+  -e '/^GCJ_FOR_ECJX =/ s|\@.*\@|gcj|' \
+  -e "s|^\(jardir = \).*|\1%{_datadir}/gcc/%{_cygwin_target}/%{version}/java|" \
+  -i libjava/Makefile.{am,in}
 %endif
 
 %build
@@ -248,7 +247,7 @@ CC="%{__cc} ${RPM_OPT_FLAGS}" \
 %if %{build_java}
   --enable-libjava \
   --enable-libgcj-sublibs --disable-java-awt --disable-dssi \
-  --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
+  --with-ecj-jar=%{_datadir}/java/ecj.jar \
 %endif
   --with-bugurl=http://cygwinports.org
 
@@ -271,7 +270,6 @@ 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
 
@@ -365,6 +363,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/gcc/%{_cygwin_target}/%{version}/install-tools/*
 %{_libexecdir}/gcc/%{_cygwin_target}/%{version}/lto1
 %{_libexecdir}/gcc/%{_cygwin_target}/%{version}/lto-wrapper
+%dir %{_datadir}/gcc
+%dir %{_datadir}/gcc/%{_cygwin_target}
+%dir %{_datadir}/gcc/%{_cygwin_target}/%{version}
 %if %{build_java}
 %{_cygwin_bindir}/cygffi-4.dll
 %endif
@@ -373,7 +374,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_cygwin_bindir}/cygssp-0.dll
 %{_mandir}/man1/%{_cygwin_target}-gcc.1*
 %{_mandir}/man1/%{_cygwin_target}-gcov.1*
-%{_cygwin_datadir}/gcc-%{version}/
 %doc gcc/README* gcc/COPYING*
 
 
@@ -402,6 +402,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/libsupc++.a
 %{_libexecdir}/gcc/%{_cygwin_target}/%{version}/cc1plus
 %{_libexecdir}/gcc/%{_cygwin_target}/%{version}/collect2
+%dir %{_datadir}/gcc/%{_cygwin_target}/%{version}/python
+%{_datadir}/gcc/%{_cygwin_target}/%{version}/python/libstdcxx/
 %{_cygwin_bindir}/cygstdc++-6.dll
 
 
@@ -443,8 +445,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/adainclude/
 %{_libdir}/gcc/%{_cygwin_target}/%{version}/adalib/
 %{_libexecdir}/gcc/%{_cygwin_target}/%{version}/gnat1
-#%{_cygwin_bindir}/cyggnarl-4.5.dll
-#%{_cygwin_bindir}/cyggnat-4.5.dll
+#%%{_cygwin_bindir}/cyggnarl-4.5.dll
+#%%{_cygwin_bindir}/cyggnat-4.5.dll
 %endif
 
 
@@ -481,10 +483,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_cygwin_bindir}/cyggij-11.dll
 %{_cygwin_bindir}/cygjvm.dll
 %{_cygwin_libdir}/pkgconfig/libgcj-4.5.pc
+%{_datadir}/gcc/%{_cygwin_target}/%{version}/java
 %endif
 
 
 %changelog
+* Thu May 26 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 4.5.3-1
+- Version bump.
+
 * Sun Mar 13 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 4.5.1-2
 - Ship libiberty.a from cygwin-binutils-devel instead of cygwin-gcc.
 
diff --git a/sources b/sources
index a3def18..1e11f67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96e2cdf69519fe9e125304daa8b1120a  gcc-4.5-20101118.tar.bz2
+8e0b5c12212e185f3e4383106bfa9cc6  gcc-4.5.3.tar.bz2