[rtems-crossrpms commit] Update.

[Ralf Corsepius]

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

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

Update.

---

 cygwin/i686/Makefile.am                 |    2 +-
 cygwin/i686/Makefile.in                 |    2 +-
 cygwin/i686/i686-pc-cygwin-ncurses.spec |   18 +++++++++---------
 cygwin/i686/ncurses.add                 |   16 ++++++++--------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index f7eac7a..9359852 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -15,7 +15,7 @@ W32API_RPMREL = 0.20121216.0%{?dist}
 include ../w32api.am
 
 NCURSES_VERS = 5.7-18
-NCURSES_RPMREL = 0.20121216.0%{?dist}
+NCURSES_RPMREL = 0.20131209.0%{?dist}
 include ../ncurses.am
 
 EXPAT_VERS = 2.1.0-3
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index a1b69cd..7343bd2 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -270,7 +270,7 @@ 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.20121216.0%{?dist}
+NCURSES_RPMREL = 0.20131209.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
diff --git a/cygwin/i686/i686-pc-cygwin-ncurses.spec b/cygwin/i686/i686-pc-cygwin-ncurses.spec
index cc47b5e..7054abe 100644
--- a/cygwin/i686/i686-pc-cygwin-ncurses.spec
+++ b/cygwin/i686/i686-pc-cygwin-ncurses.spec
@@ -35,19 +35,19 @@
 %define ncurses_rpmvers %{expand:%(echo 5.7-18 | tr - _)} 
 
 Name:         i686-pc-cygwin-ncurses
-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:      	%ncurses_rpmvers
 Summary:      	Cygwin ncurses Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/ncurses/ncurses-%{ncurses_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses10/libncurses10-%{ncurses_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses-devel/libncurses-devel-%{ncurses_version}.tar.bz2
+Source0:	ftp://cygwin.com/pub/cygwin/x86/release/ncurses/ncurses-%{ncurses_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/x86/release/ncurses/libncurses10/libncurses10-%{ncurses_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/ncurses/libncurses-devel/libncurses-devel-%{ncurses_version}.tar.bz2
 
 BuildRequires:  i686-pc-cygwin-terminfo
 
@@ -59,16 +59,16 @@ Requires:       i686-pc-cygwin-terminfo
 Cygwin ncurses 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/ncurses.add b/cygwin/i686/ncurses.add
index 43e4fc0..6516763 100644
--- a/cygwin/i686/ncurses.add
+++ b/cygwin/i686/ncurses.add
@@ -6,15 +6,15 @@ Release:      @NCURSES_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:      	%ncurses_rpmvers
 Summary:      	Cygwin ncurses Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/ncurses/ncurses-%{ncurses_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses10/libncurses10-%{ncurses_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses-devel/libncurses-devel-%{ncurses_version}.tar.bz2
+Source0:	ftp://cygwin.com/pub/cygwin/x86/release/ncurses/ncurses-%{ncurses_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/x86/release/ncurses/libncurses10/libncurses10-%{ncurses_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/ncurses/libncurses-devel/libncurses-devel-%{ncurses_version}.tar.bz2
 
 BuildRequires:  @rpmprefix@@tool_target at -terminfo
 
@@ -26,16 +26,16 @@ Requires:       @rpmprefix@@tool_target at -terminfo
 Cygwin ncurses 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