[rtems-crossrpms commit] mpc-1.0.1-2.

Ralf Corsepius ralf at rtems.org
Thu Jan 30 18:03:14 UTC 2014


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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Dec  9 06:44:04 2013 +0100

mpc-1.0.1-2.

---

 cygwin/i686/Makefile.am             |    4 ++--
 cygwin/i686/Makefile.in             |    4 ++--
 cygwin/i686/i686-pc-cygwin-mpc.spec |   24 ++++++++++--------------
 cygwin/i686/mpc.add                 |   18 +++++++-----------
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index c3f7df3..a7cf63c 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -42,8 +42,8 @@ GMP_VERS = 5.1.3-1
 GMP_RPMREL = 0.20131209.0%{?dist}
 include ../gmp.am
 
-MPC_VERS = 0.8-1
-MPC_RPMREL = 0.20121216.0%{?dist}
+MPC_VERS = 1.0.1-2
+MPC_RPMREL = 0.20131209.0%{?dist}
 include ../mpc.am
 
 MPFR_VERS = 2.4.1-4
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index b9f3cb8..f91d598 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -304,8 +304,8 @@ GMP_RPMREL = 0.20131209.0%{?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
-MPC_VERS = 0.8-1
-MPC_RPMREL = 0.20121216.0%{?dist}
+MPC_VERS = 1.0.1-2
+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
diff --git a/cygwin/i686/i686-pc-cygwin-mpc.spec b/cygwin/i686/i686-pc-cygwin-mpc.spec
index 8ffea3b..f6fcad0 100644
--- a/cygwin/i686/i686-pc-cygwin-mpc.spec
+++ b/cygwin/i686/i686-pc-cygwin-mpc.spec
@@ -31,42 +31,38 @@
 %endif
 
 %{?!el5:%global _with_noarch_subpackages 1}
-%define mpc_version 0.8-1
-%define mpc_rpmvers %{expand:%(echo 0.8-1 | tr - _)} 
+%define mpc_version 1.0.1-2
+%define mpc_rpmvers %{expand:%(echo 1.0.1-2 | tr - _)} 
 
 Name:         i686-pc-cygwin-mpc
-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:      	%mpc_rpmvers
 Summary:      	Cygwin mpc Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/mpclib/mpclib-%{mpc_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/mpclib/libmpc1/libmpc1-%{mpc_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/mpclib/libmpc-devel/libmpc-devel-%{mpc_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/x86/release/mpclib/libmpc3/libmpc3-%{mpc_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/mpclib/libmpc-devel/libmpc-devel-%{mpc_version}.tar.bz2
 
 Provides:       i686-pc-cygwin-mpc-devel = %{version}-%{release}
 Provides:	i686-pc-cygwin-libmpc = %{version}-%{release}
 Provides:       i686-pc-cygwin-libmpc-devel = %{version}-%{release}
 
 %description
-Cygwin cloog-ppl libraries.
+Cygwin mpc 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/mpc.add b/cygwin/i686/mpc.add
index 6caa690..6561365 100644
--- a/cygwin/i686/mpc.add
+++ b/cygwin/i686/mpc.add
@@ -6,34 +6,30 @@ Release:      @MPC_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:      	%mpc_rpmvers
 Summary:      	Cygwin mpc Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/mpclib/mpclib-%{mpc_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/mpclib/libmpc1/libmpc1-%{mpc_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/mpclib/libmpc-devel/libmpc-devel-%{mpc_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/x86/release/mpclib/libmpc3/libmpc3-%{mpc_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/mpclib/libmpc-devel/libmpc-devel-%{mpc_version}.tar.bz2
 
 Provides:       @rpmprefix@@tool_target at -mpc-devel = %{version}-%{release}
 Provides:	@rpmprefix@@tool_target at -libmpc = %{version}-%{release}
 Provides:       @rpmprefix@@tool_target at -libmpc-devel = %{version}-%{release}
 
 %description
-Cygwin cloog-ppl libraries.
+Cygwin mpc 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




More information about the vc mailing list