[rtems-crossrpms commit] Preps for mingw64.

Ralf Corsepius ralf at rtems.org
Mon Apr 23 07:21:19 UTC 2012 

Module:    rtems-crossrpms
Branch:    master
Commit:    e35f7fd72325049215b7a060a0375c544b44e408
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=e35f7fd72325049215b7a060a0375c544b44e408

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Apr 23 06:46:56 2012 +0200

Preps for mingw64.

---

 mingw32/gmp.am                                     |   23 +--
 mingw32/i686/Makefile.am                           |   23 +++-
 mingw32/i686/Makefile.in                           |   70 +++++----
 mingw32/i686/gmp.add                               |   66 --------
 mingw32/i686/i686-pc-mingw32-binutils-helper.spec  |    2 +-
 .../i686/i686-pc-mingw32-binutils-helper.spec.in   |    6 +-
 mingw32/i686/i686-pc-mingw32-curses-helper.spec    |    2 +-
 mingw32/i686/i686-pc-mingw32-curses-helper.spec.in |    8 +-
 mingw32/i686/i686-pc-mingw32-expat-helper.spec     |    2 +-
 mingw32/i686/i686-pc-mingw32-expat-helper.spec.in  |    8 +-
 mingw32/i686/i686-pc-mingw32-gcc-helper.spec       |    2 +-
 mingw32/i686/i686-pc-mingw32-gcc-helper.spec.in    |    6 +-
 mingw32/i686/i686-pc-mingw32-gmp-helper.spec       |   26 +++
 mingw32/i686/i686-pc-mingw32-gmp-helper.spec.in    |   26 +++
 mingw32/i686/i686-pc-mingw32-gmp.spec              |  167 -------------------
 mingw32/i686/i686-pc-mingw32-libs-helper.spec      |    2 +-
 mingw32/i686/i686-pc-mingw32-libs-helper.spec.in   |    6 +-
 mingw32/i686/i686-pc-mingw32-mpc-helper.spec       |   26 +++
 mingw32/i686/i686-pc-mingw32-mpc-helper.spec.in    |   26 +++
 mingw32/i686/i686-pc-mingw32-mpc.spec              |  170 -------------------
 mingw32/i686/i686-pc-mingw32-mpfr-helper.spec      |   26 +++
 mingw32/i686/i686-pc-mingw32-mpfr-helper.spec.in   |   26 +++
 mingw32/i686/i686-pc-mingw32-mpfr.spec             |  171 --------------------
 mingw32/i686/i686-pc-mingw32-readline-helper.spec  |    2 +-
 .../i686/i686-pc-mingw32-readline-helper.spec.in   |    8 +-
 mingw32/i686/i686-pc-mingw32-termcap-helper.spec   |    2 +-
 .../i686/i686-pc-mingw32-termcap-helper.spec.in    |    8 +-
 mingw32/i686/i686-pc-mingw32-w32api-helper.spec    |    2 +-
 mingw32/i686/i686-pc-mingw32-w32api-helper.spec.in |    6 +-
 mingw32/i686/i686-pc-mingw32-zlib-helper.spec      |    2 +-
 mingw32/i686/i686-pc-mingw32-zlib-helper.spec.in   |    8 +-
 mingw32/i686/mingw-gmp.add                         |   81 +++++++++
 mingw32/i686/mingw-gmp.spec                        |   81 +++++++++
 mingw32/i686/mingw-mpc.add                         |   85 ++++++++++
 mingw32/i686/mingw-mpc.spec                        |   85 ++++++++++
 mingw32/i686/mingw-mpfr.add                        |   85 ++++++++++
 mingw32/i686/mingw-mpfr.spec                       |   85 ++++++++++
 mingw32/i686/mpc.add                               |   69 --------
 mingw32/i686/mpfr.add                              |   69 --------
 mingw32/i686/target-gmp.add                        |    4 -
 mingw32/i686/target-mpc.add                        |    4 -
 mingw32/i686/target-mpfr.add                       |    5 -
 mingw32/mpc.am                                     |   23 +--
 mingw32/mpfr.am                                    |   23 +--
 44 files changed, 783 insertions(+), 844 deletions(-)

diff --git a/mingw32/gmp.am b/mingw32/gmp.am
index 58ef35f..8290c73 100644
--- a/mingw32/gmp.am
+++ b/mingw32/gmp.am
@@ -1,21 +1,16 @@
-EXTRA_DIST += target-gmp.add
-EXTRA_DIST += gmp.add
+EXTRA_DIST += mingw-gmp.add
 
-GMP_SUBPACKAGES = $(top_srcdir)/common/common.add
-GMP_SUBPACKAGES += $(srcdir)/gmp.add
-GMP_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GMP_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GMP_SUBPACKAGES += $(srcdir)/target-gmp.add
+GMP_SUBPACKAGES = $(srcdir)/mingw-gmp.add
 
-$(TARGET)-gmp.spec.in: $(GMP_SUBPACKAGES) Makefile.am
+mingw-gmp.spec.in: $(GMP_SUBPACKAGES) Makefile.am
 	cat $(GMP_SUBPACKAGES) | sed \
 	  -e "s/[@]GMP_VERS[@]/$(GMP_VERS)/g" \
 	  -e "s/[@]GMP_RPMREL[@]/$(GMP_RPMREL)/g" \
 	  -e "s,%{gcc_rpmvers},%{gmp_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-gmp.spec.in
-CLEANFILES += $(TARGET)-gmp.spec.in
+	| $(MKSPEC0) > mingw-gmp.spec.in
+CLEANFILES += mingw-gmp.spec.in
 
- at rpmprefix@$(TARGET)-gmp.spec: $(TARGET)-gmp.spec.in
-	$(MKSPEC) $(TARGET)-gmp.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gmp.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gmp.spec
+mingw-gmp.spec: mingw-gmp.spec.in
+	$(MKSPEC) mingw-gmp.spec.in | $(SPECSTRIP) > $@
+CLEANFILES += mingw-gmp.spec
+noinst_DATA += mingw-gmp.spec
diff --git a/mingw32/i686/Makefile.am b/mingw32/i686/Makefile.am
index 1d6df8d..783e062 100644
--- a/mingw32/i686/Makefile.am
+++ b/mingw32/i686/Makefile.am
@@ -4,16 +4,16 @@ TARGET = i686-pc-mingw32
 
 include $(top_srcdir)/mkspec.am
 
-GMP_VERS = 4.3.2
-GMP_RPMREL = 0.20100319.1%{?dist}
+GMP_VERS = 5.0.4
+GMP_RPMREL = 0.20120422.1%{?dist}
 include ../gmp.am
 
 MPC_VERS = 0.8.1
-MPC_RPMREL = 0.20100319.1%{?dist}
+MPC_RPMREL = 0.20120422.1%{?dist}
 include ../mpc.am
 
 MPFR_VERS = 2.4.2
-MPFR_RPMREL = 0.20100813.1%{?dist}
+MPFR_RPMREL = 0.20120422.1%{?dist}
 include ../mpfr.am
 
 @rpmprefix@$(TARGET)-binutils-helper.spec: $(TARGET)-binutils-helper.spec.in  
@@ -36,11 +36,26 @@ noinst_DATA += @rpmprefix@$(TARGET)-expat-helper.spec
 CLEANFILES += @rpmprefix@$(TARGET)-gcc-helper.spec
 noinst_DATA += @rpmprefix@$(TARGET)-gcc-helper.spec
 
+ at rpmprefix@$(TARGET)-gmp-helper.spec: $(TARGET)-gmp-helper.spec.in  
+	$(MKSPEC) $(TARGET)-gmp-helper.spec.in | $(SPECSTRIP) > $@
+CLEANFILES += @rpmprefix@$(TARGET)-gmp-helper.spec
+noinst_DATA += @rpmprefix@$(TARGET)-gmp-helper.spec
+
 @rpmprefix@$(TARGET)-libs-helper.spec: $(TARGET)-libs-helper.spec.in  
 	$(MKSPEC) $(TARGET)-libs-helper.spec.in | $(SPECSTRIP) > $@
 CLEANFILES += @rpmprefix@$(TARGET)-libs-helper.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs-helper.spec
 
+ at rpmprefix@$(TARGET)-mpc-helper.spec: $(TARGET)-mpc-helper.spec.in  
+	$(MKSPEC) $(TARGET)-mpc-helper.spec.in | $(SPECSTRIP) > $@
+CLEANFILES += @rpmprefix@$(TARGET)-mpc-helper.spec
+noinst_DATA += @rpmprefix@$(TARGET)-mpc-helper.spec
+
+ at rpmprefix@$(TARGET)-mpfr-helper.spec: $(TARGET)-mpfr-helper.spec.in  
+	$(MKSPEC) $(TARGET)-mpfr-helper.spec.in | $(SPECSTRIP) > $@
+CLEANFILES += @rpmprefix@$(TARGET)-mpfr-helper.spec
+noinst_DATA += @rpmprefix@$(TARGET)-mpfr-helper.spec
+
 @rpmprefix@$(TARGET)-readline-helper.spec: $(TARGET)-readline-helper.spec.in  
 	$(MKSPEC) $(TARGET)-readline-helper.spec.in | $(SPECSTRIP) > $@
 CLEANFILES += @rpmprefix@$(TARGET)-readline-helper.spec
diff --git a/mingw32/i686/Makefile.in b/mingw32/i686/Makefile.in
index 81699f2..474f3ce 100644
--- a/mingw32/i686/Makefile.in
+++ b/mingw32/i686/Makefile.in
@@ -161,31 +161,34 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 TARGET = i686-pc-mingw32
-noinst_DATA = @rpmprefix@$(TARGET)-gmp.spec \
-	@rpmprefix@$(TARGET)-mpc.spec @rpmprefix@$(TARGET)-mpfr.spec \
+noinst_DATA = mingw-gmp.spec mingw-mpc.spec mingw-mpfr.spec \
 	@rpmprefix@$(TARGET)-binutils-helper.spec \
 	@rpmprefix@$(TARGET)-curses-helper.spec \
 	@rpmprefix@$(TARGET)-expat-helper.spec \
 	@rpmprefix@$(TARGET)-gcc-helper.spec \
+	@rpmprefix@$(TARGET)-gmp-helper.spec \
 	@rpmprefix@$(TARGET)-libs-helper.spec \
+	@rpmprefix@$(TARGET)-mpc-helper.spec \
+	@rpmprefix@$(TARGET)-mpfr-helper.spec \
 	@rpmprefix@$(TARGET)-readline-helper.spec \
 	@rpmprefix@$(TARGET)-termcap-helper.spec \
 	@rpmprefix@$(TARGET)-w32api-helper.spec \
 	@rpmprefix@$(TARGET)-zlib-helper.spec
-CLEANFILES = $(TARGET)-gmp.spec.in @rpmprefix@$(TARGET)-gmp.spec \
-	$(TARGET)-mpc.spec.in @rpmprefix@$(TARGET)-mpc.spec \
-	$(TARGET)-mpfr.spec.in @rpmprefix@$(TARGET)-mpfr.spec \
+CLEANFILES = mingw-gmp.spec.in mingw-gmp.spec mingw-mpc.spec.in \
+	mingw-mpc.spec mingw-mpfr.spec.in mingw-mpfr.spec \
 	@rpmprefix@$(TARGET)-binutils-helper.spec \
 	@rpmprefix@$(TARGET)-curses-helper.spec \
 	@rpmprefix@$(TARGET)-expat-helper.spec \
 	@rpmprefix@$(TARGET)-gcc-helper.spec \
+	@rpmprefix@$(TARGET)-gmp-helper.spec \
 	@rpmprefix@$(TARGET)-libs-helper.spec \
+	@rpmprefix@$(TARGET)-mpc-helper.spec \
+	@rpmprefix@$(TARGET)-mpfr-helper.spec \
 	@rpmprefix@$(TARGET)-readline-helper.spec \
 	@rpmprefix@$(TARGET)-termcap-helper.spec \
 	@rpmprefix@$(TARGET)-w32api-helper.spec \
 	@rpmprefix@$(TARGET)-zlib-helper.spec
-EXTRA_DIST = target-gmp.add gmp.add target-mpc.add mpc.add \
-	target-mpfr.add mpfr.add
+EXTRA_DIST = mingw-gmp.add mingw-mpc.add mingw-mpfr.add
 SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
 MKSPEC = sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -199,21 +202,15 @@ MKSPEC0 = sed \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]rtems_api[@]/$(rtems_api)/g"
 
-GMP_VERS = 4.3.2
-GMP_RPMREL = 0.20100319.1%{?dist}
-GMP_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/gmp.add \
-	$(top_srcdir)/gcc/rpm-install.add \
-	$(top_srcdir)/common/clean.add $(srcdir)/target-gmp.add
+GMP_VERS = 5.0.4
+GMP_RPMREL = 0.20120422.1%{?dist}
+GMP_SUBPACKAGES = $(srcdir)/mingw-gmp.add
 MPC_VERS = 0.8.1
-MPC_RPMREL = 0.20100319.1%{?dist}
-MPC_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/mpc.add \
-	$(top_srcdir)/gcc/rpm-install.add \
-	$(top_srcdir)/common/clean.add $(srcdir)/target-mpc.add
+MPC_RPMREL = 0.20120422.1%{?dist}
+MPC_SUBPACKAGES = $(srcdir)/mingw-mpc.add
 MPFR_VERS = 2.4.2
-MPFR_RPMREL = 0.20100813.1%{?dist}
-MPFR_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/mpfr.add \
-	$(top_srcdir)/gcc/rpm-install.add \
-	$(top_srcdir)/common/clean.add $(srcdir)/target-mpfr.add
+MPFR_RPMREL = 0.20120422.1%{?dist}
+MPFR_SUBPACKAGES = $(srcdir)/mingw-mpfr.add
 all: all-am
 
 .SUFFIXES:
@@ -399,35 +396,35 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
 
 
-$(TARGET)-gmp.spec.in: $(GMP_SUBPACKAGES) Makefile.am
+mingw-gmp.spec.in: $(GMP_SUBPACKAGES) Makefile.am
 	cat $(GMP_SUBPACKAGES) | sed \
 	  -e "s/[@]GMP_VERS[@]/$(GMP_VERS)/g" \
 	  -e "s/[@]GMP_RPMREL[@]/$(GMP_RPMREL)/g" \
 	  -e "s,%{gcc_rpmvers},%{gmp_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-gmp.spec.in
+	| $(MKSPEC0) > mingw-gmp.spec.in
 
- at rpmprefix@$(TARGET)-gmp.spec: $(TARGET)-gmp.spec.in
-	$(MKSPEC) $(TARGET)-gmp.spec.in | $(SPECSTRIP) > $@
+mingw-gmp.spec: mingw-gmp.spec.in
+	$(MKSPEC) mingw-gmp.spec.in | $(SPECSTRIP) > $@
 
-$(TARGET)-mpc.spec.in: $(MPC_SUBPACKAGES) Makefile.am
+mingw-mpc.spec.in: $(MPC_SUBPACKAGES) Makefile.am
 	cat $(MPC_SUBPACKAGES) | sed \
 	  -e "s/[@]MPC_VERS[@]/$(MPC_VERS)/g" \
 	  -e "s/[@]MPC_RPMREL[@]/$(MPC_RPMREL)/g" \
 	  -e "s,%{gcc_rpmvers},%{mpc_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-mpc.spec.in
+	| $(MKSPEC0) > mingw-mpc.spec.in
 
- at rpmprefix@$(TARGET)-mpc.spec: $(TARGET)-mpc.spec.in
-	$(MKSPEC) $(TARGET)-mpc.spec.in | $(SPECSTRIP) > $@
+mingw-mpc.spec: mingw-mpc.spec.in
+	$(MKSPEC) mingw-mpc.spec.in | $(SPECSTRIP) > $@
 
-$(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am
+mingw-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am
 	cat $(MPFR_SUBPACKAGES) | sed \
 	  -e "s/[@]MPFR_VERS[@]/$(MPFR_VERS)/g" \
 	  -e "s/[@]MPFR_RPMREL[@]/$(MPFR_RPMREL)/g" \
 	  -e "s,%{gcc_rpmvers},%{mpfr_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-mpfr.spec.in
+	| $(MKSPEC0) > mingw-mpfr.spec.in
 
- at rpmprefix@$(TARGET)-mpfr.spec: $(TARGET)-mpfr.spec.in
-	$(MKSPEC) $(TARGET)-mpfr.spec.in | $(SPECSTRIP) > $@
+mingw-mpfr.spec: mingw-mpfr.spec.in
+	$(MKSPEC) mingw-mpfr.spec.in | $(SPECSTRIP) > $@
 
 @rpmprefix@$(TARGET)-binutils-helper.spec: $(TARGET)-binutils-helper.spec.in  
 	$(MKSPEC) $(TARGET)-binutils-helper.spec.in | $(SPECSTRIP) > $@
@@ -441,9 +438,18 @@ $(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am
 @rpmprefix@$(TARGET)-gcc-helper.spec: $(TARGET)-gcc-helper.spec.in  
 	$(MKSPEC) $(TARGET)-gcc-helper.spec.in | $(SPECSTRIP) > $@
 
+ at rpmprefix@$(TARGET)-gmp-helper.spec: $(TARGET)-gmp-helper.spec.in  
+	$(MKSPEC) $(TARGET)-gmp-helper.spec.in | $(SPECSTRIP) > $@
+
 @rpmprefix@$(TARGET)-libs-helper.spec: $(TARGET)-libs-helper.spec.in  
 	$(MKSPEC) $(TARGET)-libs-helper.spec.in | $(SPECSTRIP) > $@
 
+ at rpmprefix@$(TARGET)-mpc-helper.spec: $(TARGET)-mpc-helper.spec.in  
+	$(MKSPEC) $(TARGET)-mpc-helper.spec.in | $(SPECSTRIP) > $@
+
+ at rpmprefix@$(TARGET)-mpfr-helper.spec: $(TARGET)-mpfr-helper.spec.in  
+	$(MKSPEC) $(TARGET)-mpfr-helper.spec.in | $(SPECSTRIP) > $@
+
 @rpmprefix@$(TARGET)-readline-helper.spec: $(TARGET)-readline-helper.spec.in  
 	$(MKSPEC) $(TARGET)-readline-helper.spec.in | $(SPECSTRIP) > $@
 
diff --git a/mingw32/i686/gmp.add b/mingw32/i686/gmp.add
deleted file mode 100644
index 1790d2c..0000000
--- a/mingw32/i686/gmp.add
+++ /dev/null
@@ -1,66 +0,0 @@
-%define gmp_version @GMP_VERS@
-%define gmp_rpmvers %{expand:%(echo @GMP_VERS@ | tr - _)} 
-%define debug_package %{nil}
-
-Name:         @rpmprefix@@tool_target at -gmp
-Release:      @GMP_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%gmp_rpmvers
-Summary:      	MinGW gmp Libraries
-
-Source0:	ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
-Provides:	@rpmprefix@@tool_target at -gmp-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-
-BuildRequires:  m4
-BuildRequires:	@rpmprefix at i686-pc-mingw32-gcc
-
-%description
-MinGW gmp libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../gmp-%{gmp_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=@tool_target@ \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
diff --git a/mingw32/i686/i686-pc-mingw32-binutils-helper.spec b/mingw32/i686/i686-pc-mingw32-binutils-helper.spec
index cebe960..2653503 100644
--- a/mingw32/i686/i686-pc-mingw32-binutils-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-binutils-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-binutils-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS binutils helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-binutils-helper.spec.in b/mingw32/i686/i686-pc-mingw32-binutils-helper.spec.in
index 1085587..a0e96f7 100644
--- a/mingw32/i686/i686-pc-mingw32-binutils-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-binutils-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-binutils-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -binutils-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS binutils helper
 
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-binutils
 Requires:       mingw32-binutils
-Provides:	@rpmprefix at i686-pc-mingw32-binutils
+Provides:	@rpmprefix@@tool_target at -binutils
 
 %description
 %{summary}
diff --git a/mingw32/i686/i686-pc-mingw32-curses-helper.spec b/mingw32/i686/i686-pc-mingw32-curses-helper.spec
index cd10347..8b2d72d 100644
--- a/mingw32/i686/i686-pc-mingw32-curses-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-curses-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-curses-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 curses libs helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-curses-helper.spec.in b/mingw32/i686/i686-pc-mingw32-curses-helper.spec.in
index eae4095..3c9c047 100644
--- a/mingw32/i686/i686-pc-mingw32-curses-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-curses-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-curses-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -curses-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 curses libs helper
 
@@ -10,8 +10,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-pdcurses
 Requires:       mingw32-pdcurses
-Provides:	@rpmprefix at i686-pc-mingw32-ncurses
-Provides:	@rpmprefix at i686-pc-mingw32-ncurses-devel
+Provides:	@rpmprefix@@tool_target at -ncurses
+Provides:	@rpmprefix@@tool_target at -ncurses-devel
 
 %description
 %{summary}
diff --git a/mingw32/i686/i686-pc-mingw32-expat-helper.spec b/mingw32/i686/i686-pc-mingw32-expat-helper.spec
index ee42d85..fd4195e 100644
--- a/mingw32/i686/i686-pc-mingw32-expat-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-expat-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-expat-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 expat libs helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-expat-helper.spec.in b/mingw32/i686/i686-pc-mingw32-expat-helper.spec.in
index 19aa7f7..56da446 100644
--- a/mingw32/i686/i686-pc-mingw32-expat-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-expat-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-expat-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -expat-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 expat libs helper
 
@@ -10,8 +10,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-expat
 Requires:       mingw32-expat
-Provides:	@rpmprefix at i686-pc-mingw32-expat
-Provides:	@rpmprefix at i686-pc-mingw32-expat-devel
+Provides:	@rpmprefix@@tool_target at -expat
+Provides:	@rpmprefix@@tool_target at -expat-devel
 
 %description
 %{summary}
diff --git a/mingw32/i686/i686-pc-mingw32-gcc-helper.spec b/mingw32/i686/i686-pc-mingw32-gcc-helper.spec
index 8a984c4..2027c54 100644
--- a/mingw32/i686/i686-pc-mingw32-gcc-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-gcc-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-gcc-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS gcc helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-gcc-helper.spec.in b/mingw32/i686/i686-pc-mingw32-gcc-helper.spec.in
index b6f124d..e6308b2 100644
--- a/mingw32/i686/i686-pc-mingw32-gcc-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-gcc-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-gcc-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -gcc-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS gcc helper
 
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-gcc
 Requires:       mingw32-gcc
-Provides:	@rpmprefix at i686-pc-mingw32-gcc
+Provides:	@rpmprefix@@tool_target at -gcc
 
 %description
 %{summary}
diff --git a/mingw32/i686/i686-pc-mingw32-gmp-helper.spec b/mingw32/i686/i686-pc-mingw32-gmp-helper.spec
new file mode 100644
index 0000000..7b425fb
--- /dev/null
+++ b/mingw32/i686/i686-pc-mingw32-gmp-helper.spec
@@ -0,0 +1,26 @@
+Name:           i686-pc-mingw32-gmp-helper
+Version:        0.20120422.0
+Release:        1%{?dist}
+Summary:        RTEMS mingw32 gmp libs helper
+
+Group:          Development
+License:        GPLv3+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:	noarch
+BuildRequires:  mingw32-gmp
+Requires:       mingw32-gmp
+Provides:	i686-pc-mingw32-gmp
+Provides:	i686-pc-mingw32-gmp-devel
+
+%description
+%{summary}
+
+%prep
+%setup -q -c -T -n %{name}-%{version}
+
+%build
+
+%files
+
+%changelog
diff --git a/mingw32/i686/i686-pc-mingw32-gmp-helper.spec.in b/mingw32/i686/i686-pc-mingw32-gmp-helper.spec.in
new file mode 100644
index 0000000..f126b98
--- /dev/null
+++ b/mingw32/i686/i686-pc-mingw32-gmp-helper.spec.in
@@ -0,0 +1,26 @@
+Name:           @rpmprefix@@tool_target at -gmp-helper
+Version:        0.20120422.0
+Release:        1%{?dist}
+Summary:        RTEMS mingw32 gmp libs helper
+
+Group:          Development
+License:        GPLv3+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:	noarch
+BuildRequires:  mingw32-gmp
+Requires:       mingw32-gmp
+Provides:	@rpmprefix@@tool_target at -gmp
+Provides:	@rpmprefix@@tool_target at -gmp-devel
+
+%description
+%{summary}
+
+%prep
+%setup -q -c -T -n %{name}-%{version}
+
+%build
+
+%files
+
+%changelog
diff --git a/mingw32/i686/i686-pc-mingw32-gmp.spec b/mingw32/i686/i686-pc-mingw32-gmp.spec
deleted file mode 100644
index 3a41736..0000000
--- a/mingw32/i686/i686-pc-mingw32-gmp.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gmp_version 4.3.2
-%define gmp_rpmvers %{expand:%(echo 4.3.2 | tr - _)} 
-%define debug_package %{nil}
-
-Name:         i686-pc-mingw32-gmp
-Release:      0.20100319.1%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%gmp_rpmvers
-Summary:      	MinGW gmp Libraries
-
-Source0:	ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
-Provides:	i686-pc-mingw32-gmp-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-
-BuildRequires:  m4
-BuildRequires:	i686-pc-mingw32-gcc
-
-%description
-MinGW gmp libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../gmp-%{gmp_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=i686-pc-mingw32 \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
-%define __find_provides %{_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-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
diff --git a/mingw32/i686/i686-pc-mingw32-libs-helper.spec b/mingw32/i686/i686-pc-mingw32-libs-helper.spec
index 9be6359..94e87bf 100644
--- a/mingw32/i686/i686-pc-mingw32-libs-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-libs-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-libs-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 runtime libs helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-libs-helper.spec.in b/mingw32/i686/i686-pc-mingw32-libs-helper.spec.in
index 7500ffe..e540131 100644
--- a/mingw32/i686/i686-pc-mingw32-libs-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-libs-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-libs-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -libs-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 runtime libs helper
 
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-runtime
 Requires:       mingw32-runtime
-Provides:	@rpmprefix at i686-pc-mingw32-libs
+Provides:	@rpmprefix@@tool_target at -libs
 
 %description
 %{summary}
diff --git a/mingw32/i686/i686-pc-mingw32-mpc-helper.spec b/mingw32/i686/i686-pc-mingw32-mpc-helper.spec
new file mode 100644
index 0000000..37183f1
--- /dev/null
+++ b/mingw32/i686/i686-pc-mingw32-mpc-helper.spec
@@ -0,0 +1,26 @@
+Name:           i686-pc-mingw32-mpc-helper
+Version:        0.20120422.0
+Release:        1%{?dist}
+Summary:        RTEMS mingw32 mpc libs helper
+
+Group:          Development
+License:        GPLv3+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:	noarch
+BuildRequires:  mingw32-mpc
+Requires:       mingw32-mpc
+Provides:	i686-pc-mingw32-mpc
+Provides:	i686-pc-mingw32-mpc-devel
+
+%description
+%{summary}
+
+%prep
+%setup -q -c -T -n %{name}-%{version}
+
+%build
+
+%files
+
+%changelog
diff --git a/mingw32/i686/i686-pc-mingw32-mpc-helper.spec.in b/mingw32/i686/i686-pc-mingw32-mpc-helper.spec.in
new file mode 100644
index 0000000..b6ec35e
--- /dev/null
+++ b/mingw32/i686/i686-pc-mingw32-mpc-helper.spec.in
@@ -0,0 +1,26 @@
+Name:           @rpmprefix@@tool_target at -mpc-helper
+Version:        0.20120422.0
+Release:        1%{?dist}
+Summary:        RTEMS mingw32 mpc libs helper
+
+Group:          Development
+License:        GPLv3+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:	noarch
+BuildRequires:  mingw32-mpc
+Requires:       mingw32-mpc
+Provides:	@rpmprefix@@tool_target at -mpc
+Provides:	@rpmprefix@@tool_target at -mpc-devel
+
+%description
+%{summary}
+
+%prep
+%setup -q -c -T -n %{name}-%{version}
+
+%build
+
+%files
+
+%changelog
diff --git a/mingw32/i686/i686-pc-mingw32-mpc.spec b/mingw32/i686/i686-pc-mingw32-mpc.spec
deleted file mode 100644
index 9dd6fa3..0000000
--- a/mingw32/i686/i686-pc-mingw32-mpc.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define mpc_version 0.8.1
-%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)} 
-%define debug_package %{nil}
-
-Name:         i686-pc-mingw32-mpc
-Release:      0.20100319.1%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%mpc_rpmvers
-Summary:      	MinGW mpc Libraries
-
-Source0:	ftp://ftp.gnu.org/gnu/mpc/mpc-%{mpc_version}.tar.gz
-
-Provides:	i686-pc-mingw32-mpc-devel = %{version}-%{release}
-Provides:	i686-pc-mingw32-libmpc-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-
-BuildRequires:  m4
-BuildRequires:  i686-pc-mingw32-gmp-devel
-BuildRequires:  i686-pc-mingw32-mpfr-devel
-BuildRequires:	i686-pc-mingw32-gcc
-
-%description
-MinGW mpc libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../mpc-%{mpc_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=i686-pc-mingw32 \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
diff --git a/mingw32/i686/i686-pc-mingw32-mpfr-helper.spec b/mingw32/i686/i686-pc-mingw32-mpfr-helper.spec
new file mode 100644
index 0000000..dbb660a
--- /dev/null
+++ b/mingw32/i686/i686-pc-mingw32-mpfr-helper.spec
@@ -0,0 +1,26 @@
+Name:           i686-pc-mingw32-mpfr-helper
+Version:        0.20120422.0
+Release:        1%{?dist}
+Summary:        RTEMS mingw32 mpfr libs helper
+
+Group:          Development
+License:        GPLv3+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:	noarch
+BuildRequires:  mingw32-mpfr
+Requires:       mingw32-mpfr
+Provides:	i686-pc-mingw32-mpfr
+Provides:	i686-pc-mingw32-mpfr-devel
+
+%description
+%{summary}
+
+%prep
+%setup -q -c -T -n %{name}-%{version}
+
+%build
+
+%files
+
+%changelog
diff --git a/mingw32/i686/i686-pc-mingw32-mpfr-helper.spec.in b/mingw32/i686/i686-pc-mingw32-mpfr-helper.spec.in
new file mode 100644
index 0000000..8180f79
--- /dev/null
+++ b/mingw32/i686/i686-pc-mingw32-mpfr-helper.spec.in
@@ -0,0 +1,26 @@
+Name:           @rpmprefix@@tool_target at -mpfr-helper
+Version:        0.20120422.0
+Release:        1%{?dist}
+Summary:        RTEMS mingw32 mpfr libs helper
+
+Group:          Development
+License:        GPLv3+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:	noarch
+BuildRequires:  mingw32-mpfr
+Requires:       mingw32-mpfr
+Provides:	@rpmprefix@@tool_target at -mpfr
+Provides:	@rpmprefix@@tool_target at -mpfr-devel
+
+%description
+%{summary}
+
+%prep
+%setup -q -c -T -n %{name}-%{version}
+
+%build
+
+%files
+
+%changelog
diff --git a/mingw32/i686/i686-pc-mingw32-mpfr.spec b/mingw32/i686/i686-pc-mingw32-mpfr.spec
deleted file mode 100644
index 83f32c6..0000000
--- a/mingw32/i686/i686-pc-mingw32-mpfr.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define mpfr_version 2.4.2
-%define mpfr_rpmvers %{expand:%(echo 2.4.2 | tr - _)} 
-%define debug_package %{nil}
-
-Name:         i686-pc-mingw32-mpfr
-Release:      0.20100813.1%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%mpfr_rpmvers
-Summary:      	MinGW MPFR Libraries
-
-Source0:	http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-
-Provides:	i686-pc-mingw32-mpfr-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-%if 0%{?fedora} >= 9
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-%else
-%define _mingw32_sysroot %{_prefix}/i686-pc-mingw32/sys-root
-%endif
-
-BuildRequires:	i686-pc-mingw32-gcc
-BuildRequires:	i686-pc-mingw32-gmp-devel
-
-%description
-MinGW MPFR libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../mpfr-%{mpfr_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=i686-pc-mingw32 \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
-%define __find_provides %{_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-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
-
diff --git a/mingw32/i686/i686-pc-mingw32-readline-helper.spec b/mingw32/i686/i686-pc-mingw32-readline-helper.spec
index 9c176a3..ae1cef2 100644
--- a/mingw32/i686/i686-pc-mingw32-readline-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-readline-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-readline-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 readline libs helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-readline-helper.spec.in b/mingw32/i686/i686-pc-mingw32-readline-helper.spec.in
index b9f43c9..b72d0d3 100644
--- a/mingw32/i686/i686-pc-mingw32-readline-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-readline-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-readline-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -readline-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 readline libs helper
 
@@ -10,8 +10,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-readline
 Requires:       mingw32-readline
-Provides:	@rpmprefix at i686-pc-mingw32-readline
-Provides:	@rpmprefix at i686-pc-mingw32-readline-devel
+Provides:	@rpmprefix@@tool_target at -readline
+Provides:	@rpmprefix@@tool_target at -readline-devel
 
 %description
 %{summary}
diff --git a/mingw32/i686/i686-pc-mingw32-termcap-helper.spec b/mingw32/i686/i686-pc-mingw32-termcap-helper.spec
index 0171404..8a04320 100644
--- a/mingw32/i686/i686-pc-mingw32-termcap-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-termcap-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-termcap-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 termcap libs helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-termcap-helper.spec.in b/mingw32/i686/i686-pc-mingw32-termcap-helper.spec.in
index 6252413..b1d3d07 100644
--- a/mingw32/i686/i686-pc-mingw32-termcap-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-termcap-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-termcap-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -termcap-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 termcap libs helper
 
@@ -10,8 +10,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-termcap
 Requires:       mingw32-termcap
-Provides:	@rpmprefix at i686-pc-mingw32-termcap
-Provides:	@rpmprefix at i686-pc-mingw32-termcap-devel
+Provides:	@rpmprefix@@tool_target at -termcap
+Provides:	@rpmprefix@@tool_target at -termcap-devel
 
 %description
 %{summary}
diff --git a/mingw32/i686/i686-pc-mingw32-w32api-helper.spec b/mingw32/i686/i686-pc-mingw32-w32api-helper.spec
index 1c8461b..ad4235b 100644
--- a/mingw32/i686/i686-pc-mingw32-w32api-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-w32api-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-w32api-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 runtime libs helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-w32api-helper.spec.in b/mingw32/i686/i686-pc-mingw32-w32api-helper.spec.in
index 8298780..0a8e448 100644
--- a/mingw32/i686/i686-pc-mingw32-w32api-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-w32api-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-w32api-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -w32api-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 runtime libs helper
 
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-w32api
 Requires:       mingw32-w32api
-Provides:	@rpmprefix at i686-pc-mingw32-w32api
+Provides:	@rpmprefix@@tool_target at -w32api
 
 %description
 %{summary}
diff --git a/mingw32/i686/i686-pc-mingw32-zlib-helper.spec b/mingw32/i686/i686-pc-mingw32-zlib-helper.spec
index d43335f..861dc89 100644
--- a/mingw32/i686/i686-pc-mingw32-zlib-helper.spec
+++ b/mingw32/i686/i686-pc-mingw32-zlib-helper.spec
@@ -1,5 +1,5 @@
 Name:           i686-pc-mingw32-zlib-helper
-Version:        0.20090717.0
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 zlib libs helper
 
diff --git a/mingw32/i686/i686-pc-mingw32-zlib-helper.spec.in b/mingw32/i686/i686-pc-mingw32-zlib-helper.spec.in
index e8cc2a8..21a6e79 100644
--- a/mingw32/i686/i686-pc-mingw32-zlib-helper.spec.in
+++ b/mingw32/i686/i686-pc-mingw32-zlib-helper.spec.in
@@ -1,5 +1,5 @@
-Name:           @rpmprefix at i686-pc-mingw32-zlib-helper
-Version:        0.20090717.0
+Name:           @rpmprefix@@tool_target at -zlib-helper
+Version:        0.20120422.0
 Release:        1%{?dist}
 Summary:        RTEMS mingw32 zlib libs helper
 
@@ -10,8 +10,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  mingw32-zlib
 Requires:       mingw32-zlib
-Provides:	@rpmprefix at i686-pc-mingw32-zlib
-Provides:	@rpmprefix at i686-pc-mingw32-zlib-devel
+Provides:	@rpmprefix@@tool_target at -zlib
+Provides:	@rpmprefix@@tool_target at -zlib-devel
 
 %description
 %{summary}
diff --git a/mingw32/i686/mingw-gmp.add b/mingw32/i686/mingw-gmp.add
new file mode 100644
index 0000000..7585370
--- /dev/null
+++ b/mingw32/i686/mingw-gmp.add
@@ -0,0 +1,81 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%?mingw_package_header
+
+%define gmp_version 5.0.4
+%define gmp_rpmvers %{expand:%(echo 5.0.4 | tr - _)} 
+
+Name:         mingw-gmp
+Release:      0.20120422.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+BuildArch:	noarch
+
+Version:      	%gmp_rpmvers
+Summary:      	MinGW gmp Libraries
+
+Source0:	ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.xz
+
+BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+
+%if 0%{fedora} > 16
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+%else
+# Cludge to work around /usr/lib/rpm/brp-strip-static-archive corrupting *.a's
+%global __strip	%{_mingw32_strip}
+# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
+%global mingw32_sysroot %{_mingw32_sysroot}
+%endif
+
+BuildRequires:  m4
+
+%description
+%{summary}
+
+%package	-n mingw32-gmp
+Summary:	MinGW32 gmp libraries
+
+%description	-n mingw32-gmp
+%{summary}
+
+%if %{?mingw_build_win64}0
+%package	-n mingw64-gmp
+Summary:	MinGW64 gmp libraries
+
+%description	-n mingw64-gmp
+%{summary}
+%endif
+
+%?mingw_debug_package
+
+%prep
+%setup -q -n gmp-%{gmp_version}
+
+%build
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+
+%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
+
+%install
+%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+
+
+%files -n mingw32-gmp
+%defattr(-,root,root,-)
+%{mingw32_sysroot}/mingw
+%exclude %{mingw32_sysroot}/mingw/share/info/dir
+
+%if %{?mingw_build_win64}0
+%files -n mingw64-gmp
+%defattr(-,root,root,-)
+%{mingw64_sysroot}/mingw
+%exclude %{mingw64_sysroot}/mingw/share/info/dir
+%endif
diff --git a/mingw32/i686/mingw-gmp.spec b/mingw32/i686/mingw-gmp.spec
new file mode 100644
index 0000000..7585370
--- /dev/null
+++ b/mingw32/i686/mingw-gmp.spec
@@ -0,0 +1,81 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%?mingw_package_header
+
+%define gmp_version 5.0.4
+%define gmp_rpmvers %{expand:%(echo 5.0.4 | tr - _)} 
+
+Name:         mingw-gmp
+Release:      0.20120422.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+BuildArch:	noarch
+
+Version:      	%gmp_rpmvers
+Summary:      	MinGW gmp Libraries
+
+Source0:	ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.xz
+
+BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+
+%if 0%{fedora} > 16
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+%else
+# Cludge to work around /usr/lib/rpm/brp-strip-static-archive corrupting *.a's
+%global __strip	%{_mingw32_strip}
+# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
+%global mingw32_sysroot %{_mingw32_sysroot}
+%endif
+
+BuildRequires:  m4
+
+%description
+%{summary}
+
+%package	-n mingw32-gmp
+Summary:	MinGW32 gmp libraries
+
+%description	-n mingw32-gmp
+%{summary}
+
+%if %{?mingw_build_win64}0
+%package	-n mingw64-gmp
+Summary:	MinGW64 gmp libraries
+
+%description	-n mingw64-gmp
+%{summary}
+%endif
+
+%?mingw_debug_package
+
+%prep
+%setup -q -n gmp-%{gmp_version}
+
+%build
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+
+%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
+
+%install
+%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+
+
+%files -n mingw32-gmp
+%defattr(-,root,root,-)
+%{mingw32_sysroot}/mingw
+%exclude %{mingw32_sysroot}/mingw/share/info/dir
+
+%if %{?mingw_build_win64}0
+%files -n mingw64-gmp
+%defattr(-,root,root,-)
+%{mingw64_sysroot}/mingw
+%exclude %{mingw64_sysroot}/mingw/share/info/dir
+%endif
diff --git a/mingw32/i686/mingw-mpc.add b/mingw32/i686/mingw-mpc.add
new file mode 100644
index 0000000..808fdd8
--- /dev/null
+++ b/mingw32/i686/mingw-mpc.add
@@ -0,0 +1,85 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%?mingw_package_header
+
+%define mpc_version 0.8.1
+%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)} 
+
+Name:         mingw-mpc
+Release:      0.20120422.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+BuildArch:	noarch
+
+Version:      	%mpc_rpmvers
+Summary:      	MinGW mpc Libraries
+
+Source0:	http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+
+BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-gmp
+BuildRequires:  mingw32-mpfr
+
+%if 0%{fedora} > 16
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-gmp
+BuildRequires:  mingw64-mpfr
+%else
+# Cludge to work around /usr/lib/rpm/brp-strip-static-archive corrupting *.a's
+%global __strip	%{_mingw32_strip}
+# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
+%global mingw32_sysroot %{_mingw32_sysroot}
+%endif
+
+BuildRequires:  m4
+
+%description
+%{summary}
+
+%package	-n mingw32-mpc
+Summary:	MinGW32 mpc libraries
+
+%description	-n mingw32-mpc
+%{summary}
+
+%if %{?mingw_build_win64}0
+%package	-n mingw64-mpc
+Summary:	MinGW64 mpc libraries
+
+%description	-n mingw64-mpc
+%{summary}
+%endif
+
+%?mingw_debug_package
+
+%prep
+%setup -q -n mpc-%{mpc_version}
+
+%build
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+
+%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
+
+%install
+%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+
+
+%files -n mingw32-mpc
+%defattr(-,root,root,-)
+%{mingw32_sysroot}/mingw
+%exclude %{mingw32_sysroot}/mingw/share/info/dir
+
+%if %{?mingw_build_win64}0
+%files -n mingw64-mpc
+%defattr(-,root,root,-)
+%{mingw64_sysroot}/mingw
+%exclude %{mingw64_sysroot}/mingw/share/info/dir
+%endif
diff --git a/mingw32/i686/mingw-mpc.spec b/mingw32/i686/mingw-mpc.spec
new file mode 100644
index 0000000..808fdd8
--- /dev/null
+++ b/mingw32/i686/mingw-mpc.spec
@@ -0,0 +1,85 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%?mingw_package_header
+
+%define mpc_version 0.8.1
+%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)} 
+
+Name:         mingw-mpc
+Release:      0.20120422.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+BuildArch:	noarch
+
+Version:      	%mpc_rpmvers
+Summary:      	MinGW mpc Libraries
+
+Source0:	http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+
+BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-gmp
+BuildRequires:  mingw32-mpfr
+
+%if 0%{fedora} > 16
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-gmp
+BuildRequires:  mingw64-mpfr
+%else
+# Cludge to work around /usr/lib/rpm/brp-strip-static-archive corrupting *.a's
+%global __strip	%{_mingw32_strip}
+# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
+%global mingw32_sysroot %{_mingw32_sysroot}
+%endif
+
+BuildRequires:  m4
+
+%description
+%{summary}
+
+%package	-n mingw32-mpc
+Summary:	MinGW32 mpc libraries
+
+%description	-n mingw32-mpc
+%{summary}
+
+%if %{?mingw_build_win64}0
+%package	-n mingw64-mpc
+Summary:	MinGW64 mpc libraries
+
+%description	-n mingw64-mpc
+%{summary}
+%endif
+
+%?mingw_debug_package
+
+%prep
+%setup -q -n mpc-%{mpc_version}
+
+%build
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+
+%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
+
+%install
+%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+
+
+%files -n mingw32-mpc
+%defattr(-,root,root,-)
+%{mingw32_sysroot}/mingw
+%exclude %{mingw32_sysroot}/mingw/share/info/dir
+
+%if %{?mingw_build_win64}0
+%files -n mingw64-mpc
+%defattr(-,root,root,-)
+%{mingw64_sysroot}/mingw
+%exclude %{mingw64_sysroot}/mingw/share/info/dir
+%endif
diff --git a/mingw32/i686/mingw-mpfr.add b/mingw32/i686/mingw-mpfr.add
new file mode 100644
index 0000000..808fdd8
--- /dev/null
+++ b/mingw32/i686/mingw-mpfr.add
@@ -0,0 +1,85 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%?mingw_package_header
+
+%define mpc_version 0.8.1
+%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)} 
+
+Name:         mingw-mpc
+Release:      0.20120422.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+BuildArch:	noarch
+
+Version:      	%mpc_rpmvers
+Summary:      	MinGW mpc Libraries
+
+Source0:	http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+
+BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-gmp
+BuildRequires:  mingw32-mpfr
+
+%if 0%{fedora} > 16
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-gmp
+BuildRequires:  mingw64-mpfr
+%else
+# Cludge to work around /usr/lib/rpm/brp-strip-static-archive corrupting *.a's
+%global __strip	%{_mingw32_strip}
+# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
+%global mingw32_sysroot %{_mingw32_sysroot}
+%endif
+
+BuildRequires:  m4
+
+%description
+%{summary}
+
+%package	-n mingw32-mpc
+Summary:	MinGW32 mpc libraries
+
+%description	-n mingw32-mpc
+%{summary}
+
+%if %{?mingw_build_win64}0
+%package	-n mingw64-mpc
+Summary:	MinGW64 mpc libraries
+
+%description	-n mingw64-mpc
+%{summary}
+%endif
+
+%?mingw_debug_package
+
+%prep
+%setup -q -n mpc-%{mpc_version}
+
+%build
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+
+%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
+
+%install
+%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+
+
+%files -n mingw32-mpc
+%defattr(-,root,root,-)
+%{mingw32_sysroot}/mingw
+%exclude %{mingw32_sysroot}/mingw/share/info/dir
+
+%if %{?mingw_build_win64}0
+%files -n mingw64-mpc
+%defattr(-,root,root,-)
+%{mingw64_sysroot}/mingw
+%exclude %{mingw64_sysroot}/mingw/share/info/dir
+%endif
diff --git a/mingw32/i686/mingw-mpfr.spec b/mingw32/i686/mingw-mpfr.spec
new file mode 100644
index 0000000..808fdd8
--- /dev/null
+++ b/mingw32/i686/mingw-mpfr.spec
@@ -0,0 +1,85 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%?mingw_package_header
+
+%define mpc_version 0.8.1
+%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)} 
+
+Name:         mingw-mpc
+Release:      0.20120422.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+BuildArch:	noarch
+
+Version:      	%mpc_rpmvers
+Summary:      	MinGW mpc Libraries
+
+Source0:	http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+
+BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-gmp
+BuildRequires:  mingw32-mpfr
+
+%if 0%{fedora} > 16
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-gmp
+BuildRequires:  mingw64-mpfr
+%else
+# Cludge to work around /usr/lib/rpm/brp-strip-static-archive corrupting *.a's
+%global __strip	%{_mingw32_strip}
+# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
+%global mingw32_sysroot %{_mingw32_sysroot}
+%endif
+
+BuildRequires:  m4
+
+%description
+%{summary}
+
+%package	-n mingw32-mpc
+Summary:	MinGW32 mpc libraries
+
+%description	-n mingw32-mpc
+%{summary}
+
+%if %{?mingw_build_win64}0
+%package	-n mingw64-mpc
+Summary:	MinGW64 mpc libraries
+
+%description	-n mingw64-mpc
+%{summary}
+%endif
+
+%?mingw_debug_package
+
+%prep
+%setup -q -n mpc-%{mpc_version}
+
+%build
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+
+%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
+
+%install
+%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+
+
+%files -n mingw32-mpc
+%defattr(-,root,root,-)
+%{mingw32_sysroot}/mingw
+%exclude %{mingw32_sysroot}/mingw/share/info/dir
+
+%if %{?mingw_build_win64}0
+%files -n mingw64-mpc
+%defattr(-,root,root,-)
+%{mingw64_sysroot}/mingw
+%exclude %{mingw64_sysroot}/mingw/share/info/dir
+%endif
diff --git a/mingw32/i686/mpc.add b/mingw32/i686/mpc.add
deleted file mode 100644
index d7bb544..0000000
--- a/mingw32/i686/mpc.add
+++ /dev/null
@@ -1,69 +0,0 @@
-%define mpc_version @MPC_VERS@
-%define mpc_rpmvers %{expand:%(echo @MPC_VERS@ | tr - _)} 
-%define debug_package %{nil}
-
-Name:         @rpmprefix@@tool_target at -mpc
-Release:      @MPC_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%mpc_rpmvers
-Summary:      	MinGW mpc Libraries
-
-Source0:	ftp://ftp.gnu.org/gnu/mpc/mpc-%{mpc_version}.tar.gz
-
-Provides:	@rpmprefix@@tool_target at -mpc-devel = %{version}-%{release}
-Provides:	@rpmprefix@@tool_target at -libmpc-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-
-BuildRequires:  m4
-BuildRequires:  @rpmprefix at i686-pc-mingw32-gmp-devel
-BuildRequires:  @rpmprefix at i686-pc-mingw32-mpfr-devel
-BuildRequires:	@rpmprefix at i686-pc-mingw32-gcc
-
-%description
-MinGW mpc libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../mpc-%{mpc_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=@tool_target@ \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
diff --git a/mingw32/i686/mpfr.add b/mingw32/i686/mpfr.add
deleted file mode 100644
index 7d7aec6..0000000
--- a/mingw32/i686/mpfr.add
+++ /dev/null
@@ -1,69 +0,0 @@
-%define mpfr_version @MPFR_VERS@
-%define mpfr_rpmvers %{expand:%(echo @MPFR_VERS@ | tr - _)} 
-%define debug_package %{nil}
-
-Name:         @rpmprefix@@tool_target at -mpfr
-Release:      @MPFR_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%mpfr_rpmvers
-Summary:      	MinGW MPFR Libraries
-
-Source0:	http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-
-Provides:	@rpmprefix@@tool_target at -mpfr-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-%if 0%{?fedora} >= 9
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-%else
-%define _mingw32_sysroot %{_prefix}/@tool_target@/sys-root
-%endif
-
-BuildRequires:	@rpmprefix at i686-pc-mingw32-gcc
-BuildRequires:	@rpmprefix at i686-pc-mingw32-gmp-devel
-
-%description
-MinGW MPFR libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../mpfr-%{mpfr_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=@tool_target@ \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
diff --git a/mingw32/i686/target-gmp.add b/mingw32/i686/target-gmp.add
deleted file mode 100644
index 9bfb8f3..0000000
--- a/mingw32/i686/target-gmp.add
+++ /dev/null
@@ -1,4 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
diff --git a/mingw32/i686/target-mpc.add b/mingw32/i686/target-mpc.add
deleted file mode 100644
index 9bfb8f3..0000000
--- a/mingw32/i686/target-mpc.add
+++ /dev/null
@@ -1,4 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
diff --git a/mingw32/i686/target-mpfr.add b/mingw32/i686/target-mpfr.add
deleted file mode 100644
index f056292..0000000
--- a/mingw32/i686/target-mpfr.add
+++ /dev/null
@@ -1,5 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
-
diff --git a/mingw32/mpc.am b/mingw32/mpc.am
index 791dffd..91c5414 100644
--- a/mingw32/mpc.am
+++ b/mingw32/mpc.am
@@ -1,21 +1,16 @@
-EXTRA_DIST += target-mpc.add
-EXTRA_DIST += mpc.add
+EXTRA_DIST += mingw-mpc.add
 
-MPC_SUBPACKAGES = $(top_srcdir)/common/common.add
-MPC_SUBPACKAGES += $(srcdir)/mpc.add
-MPC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-MPC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-MPC_SUBPACKAGES += $(srcdir)/target-mpc.add
+MPC_SUBPACKAGES = $(srcdir)/mingw-mpc.add
 
-$(TARGET)-mpc.spec.in: $(MPC_SUBPACKAGES) Makefile.am
+mingw-mpc.spec.in: $(MPC_SUBPACKAGES) Makefile.am
 	cat $(MPC_SUBPACKAGES) | sed \
 	  -e "s/[@]MPC_VERS[@]/$(MPC_VERS)/g" \
 	  -e "s/[@]MPC_RPMREL[@]/$(MPC_RPMREL)/g" \
 	  -e "s,%{gcc_rpmvers},%{mpc_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-mpc.spec.in
-CLEANFILES += $(TARGET)-mpc.spec.in
+	| $(MKSPEC0) > mingw-mpc.spec.in
+CLEANFILES += mingw-mpc.spec.in
 
- at rpmprefix@$(TARGET)-mpc.spec: $(TARGET)-mpc.spec.in
-	$(MKSPEC) $(TARGET)-mpc.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-mpc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-mpc.spec
+mingw-mpc.spec: mingw-mpc.spec.in
+	$(MKSPEC) mingw-mpc.spec.in | $(SPECSTRIP) > $@
+CLEANFILES += mingw-mpc.spec
+noinst_DATA += mingw-mpc.spec
diff --git a/mingw32/mpfr.am b/mingw32/mpfr.am
index 73ef84b..5952ca9 100644
--- a/mingw32/mpfr.am
+++ b/mingw32/mpfr.am
@@ -1,22 +1,17 @@
-EXTRA_DIST += target-mpfr.add
-EXTRA_DIST += mpfr.add
+EXTRA_DIST += mingw-mpfr.add
 
-MPFR_SUBPACKAGES = $(top_srcdir)/common/common.add
-MPFR_SUBPACKAGES += $(srcdir)/mpfr.add
-MPFR_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-MPFR_SUBPACKAGES += $(top_srcdir)/common/clean.add
-MPFR_SUBPACKAGES += $(srcdir)/target-mpfr.add
+MPFR_SUBPACKAGES = $(srcdir)/mingw-mpfr.add
 
-$(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am
+mingw-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am
 	cat $(MPFR_SUBPACKAGES) | sed \
 	  -e "s/[@]MPFR_VERS[@]/$(MPFR_VERS)/g" \
 	  -e "s/[@]MPFR_RPMREL[@]/$(MPFR_RPMREL)/g" \
 	  -e "s,%{gcc_rpmvers},%{mpfr_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-mpfr.spec.in
-CLEANFILES += $(TARGET)-mpfr.spec.in
+	| $(MKSPEC0) > mingw-mpfr.spec.in
+CLEANFILES += mingw-mpfr.spec.in
 
- at rpmprefix@$(TARGET)-mpfr.spec: $(TARGET)-mpfr.spec.in
-	$(MKSPEC) $(TARGET)-mpfr.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-mpfr.spec
-noinst_DATA += @rpmprefix@$(TARGET)-mpfr.spec
+mingw-mpfr.spec: mingw-mpfr.spec.in
+	$(MKSPEC) mingw-mpfr.spec.in | $(SPECSTRIP) > $@
+CLEANFILES += mingw-mpfr.spec
+noinst_DATA += mingw-mpfr.spec

More information about the vc mailing list