[rtems-crossrpms commit] expat-2.1.0-3.

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


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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Dec  9 05:01:28 2013 +0100

expat-2.1.0-3.

---

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

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index b7eb0bb..080dd32 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -18,8 +18,8 @@ NCURSES_VERS = 5.7-18
 NCURSES_RPMREL = 0.20121216.0%{?dist}
 include ../ncurses.am
 
-EXPAT_VERS = 2.0.1-1
-EXPAT_RPMREL = 0.20121216.0%{?dist}
+EXPAT_VERS = 2.1.0-3
+EXPAT_RPMREL = 0.20131209.0%{?dist}
 include ../expat.am
 
 READLINE_VERS = 6.1.2-2
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index 4426eb8..29659c5 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -274,8 +274,8 @@ NCURSES_RPMREL = 0.20121216.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.0.1-1
-EXPAT_RPMREL = 0.20121216.0%{?dist}
+EXPAT_VERS = 2.1.0-3
+EXPAT_RPMREL = 0.20131209.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
diff --git a/cygwin/i686/expat.add b/cygwin/i686/expat.add
index 1f3ac1c..74bd895 100644
--- a/cygwin/i686/expat.add
+++ b/cygwin/i686/expat.add
@@ -6,15 +6,15 @@ Release:      @EXPAT_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:      	%expat_rpmvers
 Summary:      	Cygwin expat Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/expat/expat-%{expat_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1/libexpat1-%{expat_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1-devel/libexpat1-devel-%{expat_version}.tar.bz2
+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
 
 Provides:       @rpmprefix@@tool_target at -expat-devel = %{version}-%{release}
 
diff --git a/cygwin/i686/i686-pc-cygwin-expat.spec b/cygwin/i686/i686-pc-cygwin-expat.spec
index 80e99ac..622e19d 100644
--- a/cygwin/i686/i686-pc-cygwin-expat.spec
+++ b/cygwin/i686/i686-pc-cygwin-expat.spec
@@ -31,23 +31,23 @@
 %endif
 
 %{?!el5:%global _with_noarch_subpackages 1}
-%define expat_version 2.0.1-1
-%define expat_rpmvers %{expand:%(echo 2.0.1-1 | tr - _)} 
+%define expat_version 2.1.0-3
+%define expat_rpmvers %{expand:%(echo 2.1.0-3 | tr - _)} 
 
 Name:         i686-pc-cygwin-expat
-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:      	%expat_rpmvers
 Summary:      	Cygwin expat Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/expat/expat-%{expat_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1/libexpat1-%{expat_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1-devel/libexpat1-devel-%{expat_version}.tar.bz2
+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
 
 Provides:       i686-pc-cygwin-expat-devel = %{version}-%{release}
 




More information about the vc mailing list