[rtems-crossrpms commit] Sync with x86_64-pc-cygwin.

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


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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Wed Dec 11 05:36:17 2013 +0100

Sync with x86_64-pc-cygwin.

---

 cygwin/i686/Makefile.am                   |   24 +++++++++++-------------
 cygwin/i686/Makefile.in                   |   25 +++++++++++--------------
 cygwin/i686/binutils-sources.add          |    5 +++--
 cygwin/i686/cloog-ppl.add                 |    8 ++++----
 cygwin/i686/expat.add                     |   10 ++++------
 cygwin/i686/gmp.add                       |    4 +---
 cygwin/i686/i686-pc-cygwin-binutils.spec  |    7 ++++---
 cygwin/i686/i686-pc-cygwin-cloog-ppl.spec |   10 +++++-----
 cygwin/i686/i686-pc-cygwin-expat.spec     |   12 +++++-------
 cygwin/i686/i686-pc-cygwin-gmp.spec       |    6 ++----
 cygwin/i686/i686-pc-cygwin-mpc.spec       |    2 +-
 cygwin/i686/i686-pc-cygwin-mpfr.spec      |    2 +-
 cygwin/i686/i686-pc-cygwin-ncurses.spec   |    2 +-
 cygwin/i686/i686-pc-cygwin-readline.spec  |    6 +++---
 cygwin/i686/i686-pc-cygwin-terminfo.spec  |    2 +-
 cygwin/i686/i686-pc-cygwin-zlib.spec      |   10 ++++------
 cygwin/i686/readline.add                  |    4 ++--
 cygwin/i686/zlib.add                      |    8 +++-----
 18 files changed, 66 insertions(+), 81 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index 61986f6..c00a903 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -7,7 +7,7 @@ CYGWIN_RPMREL = 0.20131210.0%{?dist}
 include ../cygwin.am
 
 CLOOG_PPL_VERS = 0.15.11-1
-CLOOG_PPL_RPMREL = 0.20131209.0%{?dist}
+CLOOG_PPL_RPMREL = 0.20131210.0%{?dist}
 include ../cloog_ppl.am
 
 W32API_VERS = 3.17-2
@@ -15,15 +15,15 @@ W32API_RPMREL = 0.20121216.0%{?dist}
 include ../w32api.am
 
 NCURSES_VERS = 5.7-18
-NCURSES_RPMREL = 0.20131209.0%{?dist}
+NCURSES_RPMREL = 0.20131210.0%{?dist}
 include ../ncurses.am
 
 EXPAT_VERS = 2.1.0-3
-EXPAT_RPMREL = 0.20131209.0%{?dist}
+EXPAT_RPMREL = 0.20131210.0%{?dist}
 include ../expat.am
 
 READLINE_VERS = 6.1.2-3
-READLINE_RPMREL = 0.20131209.0%{?dist}
+READLINE_RPMREL = 0.20131210.0%{?dist}
 include ../readline.am
 
 TERMCAP_VERS = 5.7_20091114-14
@@ -31,30 +31,28 @@ TERMCAP_RPMREL = 0.20131209.0%{?dist}
 include ../termcap.am
 
 TERMINFO_VERS = 5.7_20091114-14
-TERMINFO_RPMREL = 0.20131209.0%{?dist}
+TERMINFO_RPMREL = 0.20131210.0%{?dist}
 include ../terminfo.am
 
 ZLIB_VERS = 1.2.8-1
-ZLIB_RPMREL = 0.20131209.0%{?dist}
+ZLIB_RPMREL = 0.20131210.0%{?dist}
 include ../zlib.am
 
 GMP_VERS = 5.1.3-1
-GMP_RPMREL = 0.20131209.0%{?dist}
+GMP_RPMREL = 0.20131210.0%{?dist}
 include ../gmp.am
 
 MPC_VERS = 1.0.1-2
-MPC_RPMREL = 0.20131209.1%{?dist}
+MPC_RPMREL = 0.20131210.0%{?dist}
 include ../mpc.am
 
 MPFR_VERS = 3.1.2-1
-MPFR_RPMREL = 0.20131209.0%{?dist}
+MPFR_RPMREL = 0.20131210.0%{?dist}
 include ../mpfr.am
 
-# Cygwin's binutils' versioning is bizarre
-# Check bfd/configure for the real version number
 BINUTILS_VERS = 2.23.51-1
-BINUTILS_PKGVERS = 2.23.51-1
-BINUTILS_RPMREL = 0.20131209.0
+BINUTILS_PKGVERS = $(BINUTILS_VERS)
+BINUTILS_RPMREL = 0.20131211.0
 include ../binutils.am
 BINUTILS_OPTS += --disable-infos
 
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index da7c70c..cba71d0 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -260,7 +260,7 @@ LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/libs.add \
 	$(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-libs.add
 CLOOG_PPL_VERS = 0.15.11-1
-CLOOG_PPL_RPMREL = 0.20131209.0%{?dist}
+CLOOG_PPL_RPMREL = 0.20131210.0%{?dist}
 CLOOG_PPL_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/cloog-ppl.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-cloog-ppl.add
@@ -270,17 +270,17 @@ W32API_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/w32api.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-w32api.add
 NCURSES_VERS = 5.7-18
-NCURSES_RPMREL = 0.20131209.0%{?dist}
+NCURSES_RPMREL = 0.20131210.0%{?dist}
 NCURSES_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/ncurses.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-ncurses.add
 EXPAT_VERS = 2.1.0-3
-EXPAT_RPMREL = 0.20131209.0%{?dist}
+EXPAT_RPMREL = 0.20131210.0%{?dist}
 EXPAT_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/expat.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-expat.add
 READLINE_VERS = 6.1.2-3
-READLINE_RPMREL = 0.20131209.0%{?dist}
+READLINE_RPMREL = 0.20131210.0%{?dist}
 READLINE_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/readline.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-readline.add
@@ -290,36 +290,33 @@ TERMCAP_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/termcap.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-termcap.add
 TERMINFO_VERS = 5.7_20091114-14
-TERMINFO_RPMREL = 0.20131209.0%{?dist}
+TERMINFO_RPMREL = 0.20131210.0%{?dist}
 TERMINFO_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/terminfo.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-terminfo.add
 ZLIB_VERS = 1.2.8-1
-ZLIB_RPMREL = 0.20131209.0%{?dist}
+ZLIB_RPMREL = 0.20131210.0%{?dist}
 ZLIB_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/zlib.add \
 	$(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-zlib.add
 GMP_VERS = 5.1.3-1
-GMP_RPMREL = 0.20131209.0%{?dist}
+GMP_RPMREL = 0.20131210.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 = 1.0.1-2
-MPC_RPMREL = 0.20131209.1%{?dist}
+MPC_RPMREL = 0.20131210.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 = 3.1.2-1
-MPFR_RPMREL = 0.20131209.0%{?dist}
+MPFR_RPMREL = 0.20131210.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
-
-# Cygwin's binutils' versioning is bizarre
-# Check bfd/configure for the real version number
 BINUTILS_VERS = 2.23.51-1
-BINUTILS_PKGVERS = 2.23.51-1
-BINUTILS_RPMREL = 0.20131209.0
+BINUTILS_PKGVERS = $(BINUTILS_VERS)
+BINUTILS_RPMREL = 0.20131211.0
 BINUTILS_OPTS = --disable-infos
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
diff --git a/cygwin/i686/binutils-sources.add b/cygwin/i686/binutils-sources.add
index fd9f4c3..6ef3a54 100644
--- a/cygwin/i686/binutils-sources.add
+++ b/cygwin/i686/binutils-sources.add
@@ -1,3 +1,4 @@
-Source0:	ftp://cygwin.com/pub/cygwin/x86/release/binutils/binutils-%{binutils_pkgvers}-src.tar.bz2
+# Repackaged sources from ftp://cygwin.com/pub/cygwin/x86/release/binutils/binutils-%{binutils_pkgvers}-src.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/infrastructure/i686-pc-cygwin/cygwin-binutils-%{binutils_pkgvers}.tar.xz
 # Misc patches to make building work
-Patch0:		cygwin-binutils-2.23.51-1-20130604.diff
+Patch0:		cygwin-binutils-2.23.51-1-20131211.diff
diff --git a/cygwin/i686/cloog-ppl.add b/cygwin/i686/cloog-ppl.add
index e38a2c7..ca826a8 100644
--- a/cygwin/i686/cloog-ppl.add
+++ b/cygwin/i686/cloog-ppl.add
@@ -23,16 +23,16 @@ Provides:       @rpmprefix@@tool_target at -cloog-ppl-devel = %{version}-%{release}
 Cygwin cloog-ppl 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 %{SOURCE0})
+  ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE1})
+  ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE2})
 
 %install
   rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/i686/expat.add b/cygwin/i686/expat.add
index 74bd895..68d0d63 100644
--- a/cygwin/i686/expat.add
+++ b/cygwin/i686/expat.add
@@ -12,9 +12,8 @@ BuildArch:	noarch
 Version:      	%expat_rpmvers
 Summary:      	Cygwin expat Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/x86/release/expat/expat-%{expat_version}.tar.bz2
 Source1:	ftp://cygwin.com/pub/cygwin/x86/release/expat/libexpat1/libexpat1-%{expat_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/x86/release/expat/libexpat1-devel/libexpat1-devel-%{expat_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/expat/libexpat-devel/libexpat-devel-%{expat_version}.tar.bz2
 
 Provides:       @rpmprefix@@tool_target at -expat-devel = %{version}-%{release}
 
@@ -22,16 +21,15 @@ Provides:       @rpmprefix@@tool_target at -expat-devel = %{version}-%{release}
 Cygwin expat 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
diff --git a/cygwin/i686/gmp.add b/cygwin/i686/gmp.add
index 3694343..e7d201b 100644
--- a/cygwin/i686/gmp.add
+++ b/cygwin/i686/gmp.add
@@ -12,7 +12,6 @@ BuildArch:	noarch
 Version:      	%gmp_rpmvers
 Summary:      	Cygwin gmp Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/x86/release/gmp/gmp-%{gmp_version}.tar.xz
 Source1:	ftp://cygwin.com/pub/cygwin/x86/release/gmp/libgmp10/libgmp10-%{gmp_version}.tar.xz
 Source2:	ftp://cygwin.com/pub/cygwin/x86/release/gmp/libgmp-devel/libgmp-devel-%{gmp_version}.tar.xz
 
@@ -22,14 +21,13 @@ Provides:	@rpmprefix@@tool_target at -gmp-devel = %{version}-%{release}
 Cygwin gmp 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} xvf %{SOURCE0})
   ( cd @tool_target@/sys-root; %{__tar} xvf %{SOURCE1})
   ( cd @tool_target@/sys-root; %{__tar} xvf %{SOURCE2})
 
diff --git a/cygwin/i686/i686-pc-cygwin-binutils.spec b/cygwin/i686/i686-pc-cygwin-binutils.spec
index 6975a3d..0e56607 100644
--- a/cygwin/i686/i686-pc-cygwin-binutils.spec
+++ b/cygwin/i686/i686-pc-cygwin-binutils.spec
@@ -39,7 +39,7 @@ Name:		i686-pc-cygwin-binutils
 Summary:	Binutils for target i686-pc-cygwin
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	0.20131209.0%{?dist}
+Release:	0.20131211.0%{?dist}
 License:	GPL/LGPL
 URL: 		http://sourceware.org/binutils
 %{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
@@ -55,9 +55,10 @@ BuildRequires:	%{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
 BuildRequires:	flex
 BuildRequires:	bison
 
-Source0:	ftp://cygwin.com/pub/cygwin/x86/release/binutils/binutils-%{binutils_pkgvers}-src.tar.bz2
+# Repackaged sources from ftp://cygwin.com/pub/cygwin/x86/release/binutils/binutils-%{binutils_pkgvers}-src.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/infrastructure/i686-pc-cygwin/cygwin-binutils-%{binutils_pkgvers}.tar.xz
 # Misc patches to make building work
-Patch0:		cygwin-binutils-2.23.51-1-20130604.diff
+Patch0:		cygwin-binutils-2.23.51-1-20131211.diff
 
 %description
 Cross binutils for target i686-pc-cygwin
diff --git a/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec b/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
index df38004..3d5079b 100644
--- a/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
+++ b/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
@@ -35,7 +35,7 @@
 %define cloog_ppl_rpmvers %{expand:%(echo 0.15.11-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-cloog-ppl
-Release:      0.20131209.0%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -56,16 +56,16 @@ Provides:       i686-pc-cygwin-cloog-ppl-devel = %{version}-%{release}
 Cygwin cloog-ppl 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 %{SOURCE0})
+  ( 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/i686-pc-cygwin-expat.spec b/cygwin/i686/i686-pc-cygwin-expat.spec
index 622e19d..f833011 100644
--- a/cygwin/i686/i686-pc-cygwin-expat.spec
+++ b/cygwin/i686/i686-pc-cygwin-expat.spec
@@ -35,7 +35,7 @@
 %define expat_rpmvers %{expand:%(echo 2.1.0-3 | tr - _)} 
 
 Name:         i686-pc-cygwin-expat
-Release:      0.20131209.0%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -45,9 +45,8 @@ BuildArch:	noarch
 Version:      	%expat_rpmvers
 Summary:      	Cygwin expat Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/x86/release/expat/expat-%{expat_version}.tar.bz2
 Source1:	ftp://cygwin.com/pub/cygwin/x86/release/expat/libexpat1/libexpat1-%{expat_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/x86/release/expat/libexpat1-devel/libexpat1-devel-%{expat_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/expat/libexpat-devel/libexpat-devel-%{expat_version}.tar.bz2
 
 Provides:       i686-pc-cygwin-expat-devel = %{version}-%{release}
 
@@ -55,16 +54,15 @@ Provides:       i686-pc-cygwin-expat-devel = %{version}-%{release}
 Cygwin expat 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/i686-pc-cygwin-gmp.spec b/cygwin/i686/i686-pc-cygwin-gmp.spec
index c603503..a3667fc 100644
--- a/cygwin/i686/i686-pc-cygwin-gmp.spec
+++ b/cygwin/i686/i686-pc-cygwin-gmp.spec
@@ -35,7 +35,7 @@
 %define gmp_rpmvers %{expand:%(echo 5.1.3-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-gmp
-Release:      0.20131209.0%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -45,7 +45,6 @@ BuildArch:	noarch
 Version:      	%gmp_rpmvers
 Summary:      	Cygwin gmp Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/x86/release/gmp/gmp-%{gmp_version}.tar.xz
 Source1:	ftp://cygwin.com/pub/cygwin/x86/release/gmp/libgmp10/libgmp10-%{gmp_version}.tar.xz
 Source2:	ftp://cygwin.com/pub/cygwin/x86/release/gmp/libgmp-devel/libgmp-devel-%{gmp_version}.tar.xz
 
@@ -55,14 +54,13 @@ Provides:	i686-pc-cygwin-gmp-devel = %{version}-%{release}
 Cygwin gmp 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} xvf %{SOURCE0})
   ( cd i686-pc-cygwin/sys-root; %{__tar} xvf %{SOURCE1})
   ( cd i686-pc-cygwin/sys-root; %{__tar} xvf %{SOURCE2})
 
diff --git a/cygwin/i686/i686-pc-cygwin-mpc.spec b/cygwin/i686/i686-pc-cygwin-mpc.spec
index 3836407..f2734b0 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.1%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
diff --git a/cygwin/i686/i686-pc-cygwin-mpfr.spec b/cygwin/i686/i686-pc-cygwin-mpfr.spec
index 521bb06..7ddbc6f 100644
--- a/cygwin/i686/i686-pc-cygwin-mpfr.spec
+++ b/cygwin/i686/i686-pc-cygwin-mpfr.spec
@@ -35,7 +35,7 @@
 %define mpfr_rpmvers %{expand:%(echo 3.1.2-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-mpfr
-Release:      0.20131209.0%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
diff --git a/cygwin/i686/i686-pc-cygwin-ncurses.spec b/cygwin/i686/i686-pc-cygwin-ncurses.spec
index 7054abe..2850db3 100644
--- a/cygwin/i686/i686-pc-cygwin-ncurses.spec
+++ b/cygwin/i686/i686-pc-cygwin-ncurses.spec
@@ -35,7 +35,7 @@
 %define ncurses_rpmvers %{expand:%(echo 5.7-18 | tr - _)} 
 
 Name:         i686-pc-cygwin-ncurses
-Release:      0.20131209.0%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
diff --git a/cygwin/i686/i686-pc-cygwin-readline.spec b/cygwin/i686/i686-pc-cygwin-readline.spec
index cee0c64..9004d46 100644
--- a/cygwin/i686/i686-pc-cygwin-readline.spec
+++ b/cygwin/i686/i686-pc-cygwin-readline.spec
@@ -35,7 +35,7 @@
 %define readline_rpmvers %{expand:%(echo 6.1.2-3 | tr - _)} 
 
 Name:         i686-pc-cygwin-readline
-Release:      0.20131209.0%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -62,8 +62,8 @@ Cygwin readline 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} xvf %{SOURCE0} )
+  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE1} )
 
 %install
   rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/i686/i686-pc-cygwin-terminfo.spec b/cygwin/i686/i686-pc-cygwin-terminfo.spec
index 468df0b..d05f8a7 100644
--- a/cygwin/i686/i686-pc-cygwin-terminfo.spec
+++ b/cygwin/i686/i686-pc-cygwin-terminfo.spec
@@ -35,7 +35,7 @@
 %define terminfo_rpmvers %{expand:%(echo 5.7_20091114-14 | tr - _)} 
 
 Name:         i686-pc-cygwin-terminfo
-Release:      0.20131209.0%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
diff --git a/cygwin/i686/i686-pc-cygwin-zlib.spec b/cygwin/i686/i686-pc-cygwin-zlib.spec
index b8ec78a..09a6fbb 100644
--- a/cygwin/i686/i686-pc-cygwin-zlib.spec
+++ b/cygwin/i686/i686-pc-cygwin-zlib.spec
@@ -35,7 +35,7 @@
 %define zlib_rpmvers %{expand:%(echo 1.2.8-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-zlib
-Release:      0.20131209.0%{?dist}
+Release:      0.20131210.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
@@ -45,7 +45,6 @@ BuildArch:	noarch
 Version:      	%zlib_rpmvers
 Summary:      	Cygwin zlib Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/x86/release/zlib/zlib-%{zlib_version}.tar.bz2
 Source1:	ftp://cygwin.com/pub/cygwin/x86/release/zlib/zlib-devel/zlib-devel-%{zlib_version}.tar.bz2
 Source2:	ftp://cygwin.com/pub/cygwin/x86/release/zlib/zlib0/zlib0-%{zlib_version}.tar.bz2
 
@@ -55,16 +54,15 @@ Provides:       i686-pc-cygwin-zlib-devel = %{version}-%{release}
 Cygwin zlib 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/readline.add b/cygwin/i686/readline.add
index 91d9aa5..5e01842 100644
--- a/cygwin/i686/readline.add
+++ b/cygwin/i686/readline.add
@@ -29,8 +29,8 @@ Cygwin readline libraries.
 
   # 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} xvf %{SOURCE0} )
+  ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE1} )
 
 %install
   rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/i686/zlib.add b/cygwin/i686/zlib.add
index 9511dca..46112d7 100644
--- a/cygwin/i686/zlib.add
+++ b/cygwin/i686/zlib.add
@@ -12,7 +12,6 @@ BuildArch:	noarch
 Version:      	%zlib_rpmvers
 Summary:      	Cygwin zlib Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/x86/release/zlib/zlib-%{zlib_version}.tar.bz2
 Source1:	ftp://cygwin.com/pub/cygwin/x86/release/zlib/zlib-devel/zlib-devel-%{zlib_version}.tar.bz2
 Source2:	ftp://cygwin.com/pub/cygwin/x86/release/zlib/zlib0/zlib0-%{zlib_version}.tar.bz2
 
@@ -22,16 +21,15 @@ Provides:       @rpmprefix@@tool_target at -zlib-devel = %{version}-%{release}
 Cygwin zlib 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