[rtems-crossrpms commit] Rebuild, cleanup.

[Ralf Corsepius]

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

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

Rebuild, cleanup.

---

 cygwin/i686/Makefile.am                  |    2 +-
 cygwin/i686/Makefile.in                  |    2 +-
 cygwin/i686/i686-pc-cygwin-terminfo.spec |   11 ++++++-----
 cygwin/i686/terminfo.add                 |    9 +++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index c0ca1a0..216e70a 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -31,7 +31,7 @@ TERMCAP_RPMREL = 0.20121216.0%{?dist}
 include ../termcap.am
 
 TERMINFO_VERS = 5.7_20091114-14
-TERMINFO_RPMREL = 0.20121216.0%{?dist}
+TERMINFO_RPMREL = 0.20131209.0%{?dist}
 include ../terminfo.am
 
 ZLIB_VERS = 1.2.8-1
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index 3f8aca1..a751e08 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -290,7 +290,7 @@ 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.20121216.0%{?dist}
+TERMINFO_RPMREL = 0.20131209.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
diff --git a/cygwin/i686/i686-pc-cygwin-terminfo.spec b/cygwin/i686/i686-pc-cygwin-terminfo.spec
index b4ddaa3..468df0b 100644
--- a/cygwin/i686/i686-pc-cygwin-terminfo.spec
+++ b/cygwin/i686/i686-pc-cygwin-terminfo.spec
@@ -35,17 +35,17 @@
 %define terminfo_rpmvers %{expand:%(echo 5.7_20091114-14 | tr - _)} 
 
 Name:         i686-pc-cygwin-terminfo
-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:      	%terminfo_rpmvers
 Summary:      	Cygwin terminfo Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/terminfo/terminfo-%{terminfo_version}.tar.bz2
+Source0:	ftp://cygwin.com/pub/cygwin/x86/release/terminfo/terminfo-%{terminfo_version}.tar.bz2
 
 Provides:       i686-pc-cygwin-terminfo-devel = %{version}-%{release}
 
@@ -53,14 +53,15 @@ Provides:       i686-pc-cygwin-terminfo-devel = %{version}-%{release}
 Cygwin terminfo 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} xvf %{SOURCE0})
 
 %install
   rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/i686/terminfo.add b/cygwin/i686/terminfo.add
index 127668c..3244b36 100644
--- a/cygwin/i686/terminfo.add
+++ b/cygwin/i686/terminfo.add
@@ -6,13 +6,13 @@ Release:      @TERMINFO_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:      	%terminfo_rpmvers
 Summary:      	Cygwin terminfo Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/terminfo/terminfo-%{terminfo_version}.tar.bz2
+Source0:	ftp://cygwin.com/pub/cygwin/x86/release/terminfo/terminfo-%{terminfo_version}.tar.bz2
 
 Provides:       @rpmprefix@@tool_target at -terminfo-devel = %{version}-%{release}
 
@@ -20,14 +20,15 @@ Provides:       @rpmprefix@@tool_target at -terminfo-devel = %{version}-%{release}
 Cygwin terminfo 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} xvf %{SOURCE0})
 
 %install
   rm -rf $RPM_BUILD_ROOT