[rtems-crossrpms commit] Revert part of previous change.
Ralf Corsepius
ralf at rtems.org
Thu Jan 30 18:03:14 UTC 2014
Module: rtems-crossrpms
Branch: master
Commit: fe020e330841f2b0b00391aa8db27e33daa5d6b3
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=fe020e330841f2b0b00391aa8db27e33daa5d6b3
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Mon Dec 9 07:11:09 2013 +0100
Revert part of previous change.
---
cygwin/i686/Makefile.am | 2 +-
cygwin/i686/Makefile.in | 2 +-
cygwin/i686/i686-pc-cygwin-mpc.spec | 4 +++-
cygwin/i686/mpc.add | 2 ++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index 3768f64..c0ca1a0 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -43,7 +43,7 @@ GMP_RPMREL = 0.20131209.0%{?dist}
include ../gmp.am
MPC_VERS = 1.0.1-2
-MPC_RPMREL = 0.20131209.0%{?dist}
+MPC_RPMREL = 0.20131209.1%{?dist}
include ../mpc.am
MPFR_VERS = 3.1.2-1
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index 687548a..3f8aca1 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -305,7 +305,7 @@ 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 = 1.0.1-2
-MPC_RPMREL = 0.20131209.0%{?dist}
+MPC_RPMREL = 0.20131209.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
diff --git a/cygwin/i686/i686-pc-cygwin-mpc.spec b/cygwin/i686/i686-pc-cygwin-mpc.spec
index f6fcad0..3836407 100644
--- a/cygwin/i686/i686-pc-cygwin-mpc.spec
+++ b/cygwin/i686/i686-pc-cygwin-mpc.spec
@@ -35,7 +35,7 @@
%define mpc_rpmvers %{expand:%(echo 1.0.1-2 | tr - _)}
Name: i686-pc-cygwin-mpc
-Release: 0.20131209.0%{?dist}
+Release: 0.20131209.1%{?dist}
License: GPL
Group: Development/Tools
@@ -59,6 +59,8 @@ Cygwin mpc libraries.
%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} xvf %{SOURCE1})
diff --git a/cygwin/i686/mpc.add b/cygwin/i686/mpc.add
index 6561365..d1c56ec 100644
--- a/cygwin/i686/mpc.add
+++ b/cygwin/i686/mpc.add
@@ -26,6 +26,8 @@ Cygwin mpc libraries.
%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} xvf %{SOURCE1})
More information about the vc
mailing list