[rtems-crossrpms commit] zlib-1.2.8-1.
Ralf Corsepius
ralf at rtems.org
Thu Jan 30 18:03:14 UTC 2014
Module: rtems-crossrpms
Branch: master
Commit: caf867d0282fcfe63c2925eaaac20a6c004a455e
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=caf867d0282fcfe63c2925eaaac20a6c004a455e
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Mon Dec 9 05:22:19 2013 +0100
zlib-1.2.8-1.
---
cygwin/i686/Makefile.am | 4 ++--
cygwin/i686/Makefile.in | 4 ++--
cygwin/i686/i686-pc-cygwin-zlib.spec | 14 +++++++-------
cygwin/i686/zlib.add | 8 ++++----
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index 6b01a2b..07a067a 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -34,8 +34,8 @@ TERMINFO_VERS = 5.7_20091114-14
TERMINFO_RPMREL = 0.20121216.0%{?dist}
include ../terminfo.am
-ZLIB_VERS = 1.2.7-1
-ZLIB_RPMREL = 0.20121216.0%{?dist}
+ZLIB_VERS = 1.2.8-1
+ZLIB_RPMREL = 0.20131209.0%{?dist}
include ../zlib.am
GMP_VERS = 4.3.2-1
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index e3bc97d..a88d925 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -294,8 +294,8 @@ TERMINFO_RPMREL = 0.20121216.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.7-1
-ZLIB_RPMREL = 0.20121216.0%{?dist}
+ZLIB_VERS = 1.2.8-1
+ZLIB_RPMREL = 0.20131209.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
diff --git a/cygwin/i686/i686-pc-cygwin-zlib.spec b/cygwin/i686/i686-pc-cygwin-zlib.spec
index d4dcf0c..b8ec78a 100644
--- a/cygwin/i686/i686-pc-cygwin-zlib.spec
+++ b/cygwin/i686/i686-pc-cygwin-zlib.spec
@@ -31,23 +31,23 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
-%define zlib_version 1.2.7-1
-%define zlib_rpmvers %{expand:%(echo 1.2.7-1 | tr - _)}
+%define zlib_version 1.2.8-1
+%define zlib_rpmvers %{expand:%(echo 1.2.8-1 | tr - _)}
Name: i686-pc-cygwin-zlib
-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: %zlib_rpmvers
Summary: Cygwin zlib Libraries
-Source0: ftp://cygwin.com/pub/cygwin/release/zlib/zlib-%{zlib_version}.tar.bz2
-Source1: ftp://cygwin.com/pub/cygwin/release/zlib/zlib-devel/zlib-devel-%{zlib_version}.tar.bz2
-Source2: ftp://cygwin.com/pub/cygwin/release/zlib/zlib0/zlib0-%{zlib_version}.tar.bz2
+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
Provides: i686-pc-cygwin-zlib-devel = %{version}-%{release}
diff --git a/cygwin/i686/zlib.add b/cygwin/i686/zlib.add
index c85a2e1..9511dca 100644
--- a/cygwin/i686/zlib.add
+++ b/cygwin/i686/zlib.add
@@ -6,15 +6,15 @@ Release: @ZLIB_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: %zlib_rpmvers
Summary: Cygwin zlib Libraries
-Source0: ftp://cygwin.com/pub/cygwin/release/zlib/zlib-%{zlib_version}.tar.bz2
-Source1: ftp://cygwin.com/pub/cygwin/release/zlib/zlib-devel/zlib-devel-%{zlib_version}.tar.bz2
-Source2: ftp://cygwin.com/pub/cygwin/release/zlib/zlib0/zlib0-%{zlib_version}.tar.bz2
+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
Provides: @rpmprefix@@tool_target at -zlib-devel = %{version}-%{release}
More information about the vc
mailing list