[rtems-crossrpms commit] Reflect w32api packaging changes.

[Ralf Corsepius]

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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Fri Dec 13 07:40:37 2013 +0100

Reflect w32api packaging changes.

---

 cygwin/gcc.am     |    4 ++--
 freebsd7.4/gcc.am |    2 +-
 freebsd8.4/gcc.am |    2 +-
 freebsd9.2/gcc.am |    2 +-
 gcc/gccnewlib.add |    4 ++--
 rtems4.11/gcc.am  |    2 +-
 solaris2.7/gcc.am |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cygwin/gcc.am b/cygwin/gcc.am
index 85058e9..61f323c 100644
--- a/cygwin/gcc.am
+++ b/cygwin/gcc.am
@@ -27,8 +27,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/^BuildRequ.*[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "s,[@]tool_target[@]-w32api-sys-root, at tool_target@-w32api," \
+	  -e "/^BuildRequ.*[@]tool_target[@]-w32api-headers-sys-root/d" \
+	  -e "s,[@]tool_target[@]-w32api-headers-sys-root, at tool_target@-w32api-headers," \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
 
diff --git a/freebsd7.4/gcc.am b/freebsd7.4/gcc.am
index a5360f1..6202b31 100644
--- a/freebsd7.4/gcc.am
+++ b/freebsd7.4/gcc.am
@@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/freebsd8.4/gcc.am b/freebsd8.4/gcc.am
index a5360f1..6202b31 100644
--- a/freebsd8.4/gcc.am
+++ b/freebsd8.4/gcc.am
@@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/freebsd9.2/gcc.am b/freebsd9.2/gcc.am
index a5360f1..6202b31 100644
--- a/freebsd9.2/gcc.am
+++ b/freebsd9.2/gcc.am
@@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/gcc/gccnewlib.add b/gcc/gccnewlib.add
index 477f300..677ebf8 100644
--- a/gcc/gccnewlib.add
+++ b/gcc/gccnewlib.add
@@ -224,14 +224,14 @@ BuildRequires:	flex bison
 BuildRequires:	%{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
 BuildRequires:	@rpmprefix@@tool_target at -binutils
 BuildRequires:	@rpmprefix@@tool_target at -sys-root
-BuildRequires:	@rpmprefix@@tool_target at -w32api-sys-root
+BuildRequires:	@rpmprefix@@tool_target at -w32api-headers-sys-root
 
 %if %build_infos
 Requires:	@rpmprefix at gcc-common
 %endif
 Requires:	@rpmprefix@@tool_target at -binutils
 Requires:	@rpmprefix@@tool_target at -sys-root
-Requires:	@rpmprefix@@tool_target at -w32api-sys-root
+Requires:	@rpmprefix@@tool_target at -w32api-headers-sys-root
 Requires:	@rpmprefix@@tool_target at -gcc-libgcc = %{gcc_rpmvers}-%{release}
 %if %build_newlib
 Requires:	@rpmprefix@@tool_target at -newlib = %{newlib_version}- at NEWLIB_RPMREL@
diff --git a/rtems4.11/gcc.am b/rtems4.11/gcc.am
index b21d3de..3e311f6 100644
--- a/rtems4.11/gcc.am
+++ b/rtems4.11/gcc.am
@@ -37,7 +37,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
 
diff --git a/solaris2.7/gcc.am b/solaris2.7/gcc.am
index 466d72e..3eaa237 100644
--- a/solaris2.7/gcc.am
+++ b/solaris2.7/gcc.am
@@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in