Regenerate.

12 files changed, 85 insertions, 86 deletions

diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec
index 9544ed7624..b97facd3a0 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec
@@ -38,7 +38,7 @@ Name:		i686-pc-cygwin-binutils
 Summary:	Binutils for target i686-pc-cygwin
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	0.20090506.1%{?dist}
+Release:	0.20090827.0%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-expat.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-expat.spec
index 91698e9ee1..69f4f8274a 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-expat.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-expat.spec
@@ -30,11 +30,11 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define expat_version 1.95.8-2
-%define expat_rpmvers %{expand:%(echo 1.95.8-2 | tr - _)} 
+%define expat_version 2.0.1-1
+%define expat_rpmvers %{expand:%(echo 2.0.1-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-expat
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -45,7 +45,7 @@ Version:      	%expat_rpmvers
 Summary:      	Cygwin expat Libraries
 
 Source0:	ftp://cygwin.com/pub/cygwin/release/expat/expat-%{expat_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat0/libexpat0-%{expat_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1/libexpat1-%{expat_version}.tar.bz2
 
 Provides:       i686-pc-cygwin-expat-devel = %{version}-%{release}
 
@@ -93,7 +93,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{expat_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{expat_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{expat_rpmvers}/find-provides
@@ -101,7 +101,7 @@ chmod +x %{_builddir}/%{name}-%{expat_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{expat_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{expat_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{expat_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec
index 1a73181829..c3ea60bbcf 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec
@@ -41,7 +41,7 @@ Summary:      	i686-pc-cygwin gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	0.20090506.1%{?dist}
+Release:      	0.20090827.0%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,10 +80,11 @@ BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers}
 
 %if %{defined _mpfr_minvers}
 # FIXME: This is an ugly cludge
-%{?fc9:%global mpfr_provided 2.3.1}
 %{?fc10:%global mpfr_provided 2.3.2}
 %{?fc11:%global mpfr_provided 2.4.1}
 %{?suse10_3:%global mpfr_provided 2.2.1}
+%{?suse11_0:%global mpfr_provided 2.3.1}
+%{?suse11_1:%global mpfr_provided 2.3.2}
 %{?cygwin:%global mpfr_provided 2.4.1}
 %{?mingw32:%global mpfr_provided %{nil}}
 
@@ -121,13 +122,7 @@ Requires:	i686-pc-cygwin-sys-root
 Requires:	i686-pc-cygwin-w32api
 
 
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
-%else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
-%endif
+%define _gcclibdir %{_prefix}/lib
 
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
@@ -197,7 +192,7 @@ cd ..
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -238,12 +233,19 @@ cd ..
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/i686-pc-cygwin/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/i686-pc-cygwin-c++filt%{_exeext}
@@ -255,18 +257,13 @@ cd ..
 # Conflict with a native GCC's man pages
   rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
 
-
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/i686-pc-cygwin-i686-pc-cygwin-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/i686-pc-cygwin/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/i686-pc-cygwin/include/bits; then
@@ -279,10 +276,10 @@ cd ..
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/i686-pc-cygwin" >> dirs
+  echo "%dir %{_gcclibdir}/gcc" >> dirs
+  echo "%dir %{_gcclibdir}/gcc/i686-pc-cygwin" >> dirs
 
-  TGTDIR="%{gcclib}/i686-pc-cygwin/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}"
   for i in $f; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
@@ -294,13 +291,12 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/i686-pc-cygwin/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -315,6 +311,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -362,7 +359,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -370,7 +367,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -423,37 +420,33 @@ GNU cc compiler for i686-pc-cygwin.
 %files -n i686-pc-cygwin-gcc -f build/files.gcc
 %defattr(-,root,root)
 %{_mandir}/man1/i686-pc-cygwin-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/i686-pc-cygwin-cpp.1*
 %{_mandir}/man1/i686-pc-cygwin-gcov.1*
-%endif
 
 %{_bindir}/i686-pc-cygwin-cpp%{_exeext}
 %{_bindir}/i686-pc-cygwin-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/i686-pc-cygwin-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/i686-pc-cygwin-gcov%{_exeext}
 %{_bindir}/i686-pc-cygwin-gccbug
 
-%dir %{gcclib}/i686-pc-cygwin/%{gcc_version}/include
+%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "i686-pc-cygwin" != "bfin-rtems4.10"
 %if "i686-pc-cygwin" != "avr-rtems4.10"
-%dir %{gcclib}/i686-pc-cygwin/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/i686-pc-cygwin/%{gcc_version}/include-fixed
+%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/i686-pc-cygwin
-%dir %{gccexec}/i686-pc-cygwin/%{gcc_version}
-%{gccexec}/i686-pc-cygwin/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/i686-pc-cygwin/%{gcc_version}/collect2%{_exeext}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/i686-pc-cygwin
+%dir %{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}
+%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/collect2%{_exeext}
 
 # ==============================================================
 # i686-pc-cygwin-gcc-c++
@@ -482,13 +475,13 @@ GCC c++ compiler for i686-pc-cygwin.
 %{_bindir}/i686-pc-cygwin-c++%{_exeext}
 %{_bindir}/i686-pc-cygwin-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/i686-pc-cygwin
-%dir %{gccexec}/i686-pc-cygwin/%{gcc_version}
-%{gccexec}/i686-pc-cygwin/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/i686-pc-cygwin
+%dir %{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}
+%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/cc1plus%{_exeext}
 
-%dir %{gcclib}/i686-pc-cygwin/%{gcc_version}/include
-%{gcclib}/i686-pc-cygwin/%{gcc_version}/include/c++
+%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include
+%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/c++
 
 
 
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec
index c9e4a25cc8..462bb1a95d 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec
@@ -30,11 +30,11 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gmp_version 4.2.1-1
-%define gmp_rpmvers %{expand:%(echo 4.2.1-1 | tr - _)} 
+%define gmp_version 4.2.4-1
+%define gmp_rpmvers %{expand:%(echo 4.2.4-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-gmp
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -96,7 +96,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
@@ -104,7 +104,7 @@ chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec
index 4328d7277c..46bb44050d 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec
@@ -34,7 +34,7 @@
 %define cygwin_rpmvers %{expand:%(echo 1.5.25-15 | tr - _)} 
 
 Name:         i686-pc-cygwin
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -90,7 +90,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{cygwin_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{cygwin_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{cygwin_rpmvers}/find-provides
@@ -98,7 +98,7 @@ chmod +x %{_builddir}/%{name}-%{cygwin_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{cygwin_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{cygwin_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{cygwin_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec
index 2f08169759..bcbccc4b06 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec
@@ -34,7 +34,7 @@
 %define mpfr_rpmvers %{expand:%(echo 2.4.1-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-mpfr
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -96,7 +96,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
@@ -104,7 +104,7 @@ chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-ncurses.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-ncurses.spec
index b3c4bf3b72..d1cd182a07 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-ncurses.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-ncurses.spec
@@ -30,11 +30,11 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define ncurses_version 5.5-3
-%define ncurses_rpmvers %{expand:%(echo 5.5-3 | tr - _)} 
+%define ncurses_version 5.7-5
+%define ncurses_rpmvers %{expand:%(echo 5.7-5 | tr - _)} 
 
 Name:         i686-pc-cygwin-ncurses
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -45,7 +45,7 @@ Version:      	%ncurses_rpmvers
 Summary:      	Cygwin ncurses Libraries
 
 Source0:	ftp://cygwin.com/pub/cygwin/release/ncurses/ncurses-%{ncurses_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses8/libncurses8-%{ncurses_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses9/libncurses9-%{ncurses_version}.tar.bz2
 Source2:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses-devel/libncurses-devel-%{ncurses_version}.tar.bz2
 
 BuildRequires:  i686-pc-cygwin-terminfo
@@ -105,7 +105,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{ncurses_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{ncurses_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{ncurses_rpmvers}/find-provides
@@ -113,7 +113,7 @@ chmod +x %{_builddir}/%{name}-%{ncurses_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{ncurses_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{ncurses_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{ncurses_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-readline.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-readline.spec
index 9cfab6149f..9fd14d963c 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-readline.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-readline.spec
@@ -34,7 +34,7 @@
 %define readline_rpmvers %{expand:%(echo 5.2.14-12 | tr - _)} 
 
 Name:         i686-pc-cygwin-readline
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -94,7 +94,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{readline_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{readline_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{readline_rpmvers}/find-provides
@@ -102,7 +102,7 @@ chmod +x %{_builddir}/%{name}-%{readline_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{readline_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{readline_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{readline_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-termcap.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-termcap.spec
index 97f2e8642e..2be46d2941 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-termcap.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-termcap.spec
@@ -34,7 +34,7 @@
 %define termcap_rpmvers %{expand:%(echo 20050421-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-termcap
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -91,7 +91,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{termcap_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{termcap_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{termcap_rpmvers}/find-provides
@@ -99,7 +99,7 @@ chmod +x %{_builddir}/%{name}-%{termcap_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{termcap_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{termcap_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{termcap_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-terminfo.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-terminfo.spec
index 421306a8de..287a176fdd 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-terminfo.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-terminfo.spec
@@ -34,7 +34,7 @@
 %define terminfo_rpmvers %{expand:%(echo 5.5_20061104-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-terminfo
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -97,7 +97,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{terminfo_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{terminfo_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{terminfo_rpmvers}/find-provides
@@ -105,7 +105,7 @@ chmod +x %{_builddir}/%{name}-%{terminfo_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{terminfo_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{terminfo_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{terminfo_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-w32api.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-w32api.spec
index c856108f23..ce73087eb2 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-w32api.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-w32api.spec
@@ -30,11 +30,11 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define w32api_version 3.12-1
-%define w32api_rpmvers %{expand:%(echo 3.12-1 | tr - _)} 
+%define w32api_version 3.13-1
+%define w32api_rpmvers %{expand:%(echo 3.13-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-w32api
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -93,7 +93,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
@@ -101,7 +101,7 @@ chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec
index 64f3fa6ce0..ebdc65e3d2 100644
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec
+++ b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec
@@ -30,11 +30,11 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define zlib_version 1.2.3-2
-%define zlib_rpmvers %{expand:%(echo 1.2.3-2 | tr - _)} 
+%define zlib_version 1.2.3-3
+%define zlib_rpmvers %{expand:%(echo 1.2.3-3 | tr - _)} 
 
 Name:         i686-pc-cygwin-zlib
-Release:      0.20090506.1%{?dist}
+Release:      0.20090827.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -45,7 +45,11 @@ Version:      	%zlib_rpmvers
 Summary:      	Cygwin zlib Libraries
 
 Source0:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib-%{zlib_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib-devel/zlib-devel-%{zlib_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib0/zlib0-%{zlib_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
+%{?_without_sources:NoSource:	1}
+%{?_without_sources:NoSource:	2}
 
 %description
 Cygwin zlib libraries.
@@ -59,6 +63,8 @@ Cygwin zlib libraries.
   # Setup sys-root (Usable for gcc >= 3.4)
   mkdir -p i686-pc-cygwin/sys-root
   ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
+  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE1})
+  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE2})
 
 %install
   rm -rf $RPM_BUILD_ROOT
@@ -91,7 +97,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 cat << EOF > %{_builddir}/%{name}-%{zlib_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{zlib_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{zlib_rpmvers}/find-provides
@@ -99,7 +105,7 @@ chmod +x %{_builddir}/%{name}-%{zlib_rpmvers}/find-provides
 cat << EOF > %{_builddir}/%{name}-%{zlib_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{zlib_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{zlib_rpmvers}/find-requires