[rtems-crossrpms commit] termcap-5.7_20091114-14.

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


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

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

termcap-5.7_20091114-14.

---

 cygwin/i686/Makefile.am                 |    4 ++--
 cygwin/i686/Makefile.in                 |    4 ++--
 cygwin/i686/i686-pc-cygwin-termcap.spec |   14 +++++++-------
 cygwin/i686/termcap.add                 |    8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index 216e70a..f7eac7a 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -26,8 +26,8 @@ READLINE_VERS = 6.1.2-3
 READLINE_RPMREL = 0.20131209.0%{?dist}
 include ../readline.am
 
-TERMCAP_VERS = 20050421-1
-TERMCAP_RPMREL = 0.20121216.0%{?dist}
+TERMCAP_VERS = 5.7_20091114-14
+TERMCAP_RPMREL = 0.20131209.0%{?dist}
 include ../termcap.am
 
 TERMINFO_VERS = 5.7_20091114-14
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index a751e08..a1b69cd 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -284,8 +284,8 @@ READLINE_RPMREL = 0.20131209.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
-TERMCAP_VERS = 20050421-1
-TERMCAP_RPMREL = 0.20121216.0%{?dist}
+TERMCAP_VERS = 5.7_20091114-14
+TERMCAP_RPMREL = 0.20131209.0%{?dist}
 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
diff --git a/cygwin/i686/i686-pc-cygwin-termcap.spec b/cygwin/i686/i686-pc-cygwin-termcap.spec
index d9697ea..8c09ba4 100644
--- a/cygwin/i686/i686-pc-cygwin-termcap.spec
+++ b/cygwin/i686/i686-pc-cygwin-termcap.spec
@@ -31,21 +31,21 @@
 %endif
 
 %{?!el5:%global _with_noarch_subpackages 1}
-%define termcap_version 20050421-1
-%define termcap_rpmvers %{expand:%(echo 20050421-1 | tr - _)} 
+%define termcap_version 5.7_20091114-14
+%define termcap_rpmvers %{expand:%(echo 5.7_20091114-14 | tr - _)} 
 
 Name:         i686-pc-cygwin-termcap
-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:      	%termcap_rpmvers
 Summary:      	Cygwin termcap Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/termcap/termcap-%{termcap_version}.tar.bz2
+Source0:	ftp://cygwin.com/pub/cygwin/x86/release/terminfo/termcap-%{termcap_version}.tar.bz2
 
 Provides:       i686-pc-cygwin-termcap-devel = %{version}-%{release}
 
@@ -53,14 +53,14 @@ Provides:       i686-pc-cygwin-termcap-devel = %{version}-%{release}
 Cygwin termcap 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/termcap.add b/cygwin/i686/termcap.add
index c258ee6..8d21c15 100644
--- a/cygwin/i686/termcap.add
+++ b/cygwin/i686/termcap.add
@@ -6,13 +6,13 @@ Release:      @TERMCAP_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:      	%termcap_rpmvers
 Summary:      	Cygwin termcap Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/termcap/termcap-%{termcap_version}.tar.bz2
+Source0:	ftp://cygwin.com/pub/cygwin/x86/release/terminfo/termcap-%{termcap_version}.tar.bz2
 
 Provides:       @rpmprefix@@tool_target at -termcap-devel = %{version}-%{release}
 
@@ -20,14 +20,14 @@ Provides:       @rpmprefix@@tool_target at -termcap-devel = %{version}-%{release}
 Cygwin termcap 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




More information about the vc mailing list