[rtems-crossrpms commit] mpfr-3.1.2-1.

[Ralf Corsepius]

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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Dec  9 07:09:48 2013 +0100

mpfr-3.1.2-1.

---

 cygwin/i686/Makefile.am              |    4 ++--
 cygwin/i686/Makefile.in              |    4 ++--
 cygwin/i686/i686-pc-cygwin-mpfr.spec |   20 +++++++++-----------
 cygwin/i686/mpfr.add                 |   14 ++++++--------
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index a7cf63c..3768f64 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -46,8 +46,8 @@ MPC_VERS = 1.0.1-2
 MPC_RPMREL = 0.20131209.0%{?dist}
 include ../mpc.am
 
-MPFR_VERS = 2.4.1-4
-MPFR_RPMREL = 0.20121216.0%{?dist}
+MPFR_VERS = 3.1.2-1
+MPFR_RPMREL = 0.20131209.0%{?dist}
 include ../mpfr.am
 
 # Cygwin's binutils' versioning is bizarre
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index f91d598..687548a 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -309,8 +309,8 @@ MPC_RPMREL = 0.20131209.0%{?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
-MPFR_VERS = 2.4.1-4
-MPFR_RPMREL = 0.20121216.0%{?dist}
+MPFR_VERS = 3.1.2-1
+MPFR_RPMREL = 0.20131209.0%{?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
diff --git a/cygwin/i686/i686-pc-cygwin-mpfr.spec b/cygwin/i686/i686-pc-cygwin-mpfr.spec
index aa8a434..521bb06 100644
--- a/cygwin/i686/i686-pc-cygwin-mpfr.spec
+++ b/cygwin/i686/i686-pc-cygwin-mpfr.spec
@@ -31,23 +31,22 @@
 %endif
 
 %{?!el5:%global _with_noarch_subpackages 1}
-%define mpfr_version 2.4.1-4
-%define mpfr_rpmvers %{expand:%(echo 2.4.1-4 | tr - _)} 
+%define mpfr_version 3.1.2-1
+%define mpfr_rpmvers %{expand:%(echo 3.1.2-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-mpfr
-Release:      0.20121216.0%{?dist}
+Release:      0.20131209.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 BuildArch:	noarch
 
 Version:      	%mpfr_rpmvers
 Summary:      	Cygwin mpfr Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/mpfr/mpfr-%{mpfr_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/mpfr/libmpfr1/libmpfr1-%{mpfr_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/mpfr/libmpfr-devel/libmpfr-devel-%{mpfr_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/x86/release/mpfr/libmpfr4/libmpfr4-%{mpfr_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/mpfr/libmpfr-devel/libmpfr-devel-%{mpfr_version}.tar.bz2
 
 Provides:	i686-pc-cygwin-mpfr-devel = %{version}-%{release}
 
@@ -55,16 +54,15 @@ Provides:	i686-pc-cygwin-mpfr-devel = %{version}-%{release}
 Cygwin mpfr libraries.
 
 %prep
-%setup -c -q
+%setup -c -q -T -n %{name}-%{version}
 
 %build
   rm -rf i686-pc-cygwin
 
   # 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})
+  ( cd i686-pc-cygwin/sys-root; %{__tar} xvf %{SOURCE1})
+  ( cd i686-pc-cygwin/sys-root; %{__tar} xvf %{SOURCE2})
 
 %install
   rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/i686/mpfr.add b/cygwin/i686/mpfr.add
index 3887892..97430c0 100644
--- a/cygwin/i686/mpfr.add
+++ b/cygwin/i686/mpfr.add
@@ -6,15 +6,14 @@ Release:      @MPFR_RPMREL@
 License:      GPL
 Group:        Development/Tools
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 BuildArch:	noarch
 
 Version:      	%mpfr_rpmvers
 Summary:      	Cygwin mpfr Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/mpfr/mpfr-%{mpfr_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/mpfr/libmpfr1/libmpfr1-%{mpfr_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/mpfr/libmpfr-devel/libmpfr-devel-%{mpfr_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/x86/release/mpfr/libmpfr4/libmpfr4-%{mpfr_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/mpfr/libmpfr-devel/libmpfr-devel-%{mpfr_version}.tar.bz2
 
 Provides:	@rpmprefix@@tool_target at -mpfr-devel = %{version}-%{release}
 
@@ -22,16 +21,15 @@ Provides:	@rpmprefix@@tool_target at -mpfr-devel = %{version}-%{release}
 Cygwin mpfr libraries.
 
 %prep
-%setup -c -q
+%setup -c -q -T -n %{name}-%{version}
 
 %build
   rm -rf @tool_target@
 
   # Setup sys-root (Usable for gcc >= 3.4)
   mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE0})
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE1})
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE2})
+  ( cd @tool_target@/sys-root; %{__tar} xvf %{SOURCE1})
+  ( cd @tool_target@/sys-root; %{__tar} xvf %{SOURCE2})
 
 %install
   rm -rf $RPM_BUILD_ROOT