Bump RPMREL.

3 files changed, 24 insertions, 8 deletions

diff --git a/contrib/crossrpms/autotools/Makefile.am b/contrib/crossrpms/autotools/Makefile.am
index 420378a62c..dc2997d1b2 100644
--- a/contrib/crossrpms/autotools/Makefile.am
+++ b/contrib/crossrpms/autotools/Makefile.am
@@ -5,9 +5,9 @@
 include $(top_srcdir)/mkspec.am
 
 AUTOCONF_VERS = 2.62
-AUTOCONF_RPMREL = 3%{?dist}
+AUTOCONF_RPMREL = 4%{?dist}
 include ./autoconf.am
 
 AUTOMAKE_VERS = 1.10.1
-AUTOMAKE_RPMREL = 3%{?dist}
+AUTOMAKE_RPMREL = 4%{?dist}
 include ./automake.am
diff --git a/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec b/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec
index 37c19d7d4a..641b147444 100644
--- a/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec
+++ b/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
-%define debug_package		%{nil}
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -48,7 +56,7 @@ License:	GPL
 URL:		http://www.gnu.org/software/autoconf
 Group:		Development/Tools
 Version:	%{rpmvers}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
 Obsoletes:	rtems-4.9-autoconf-rtems < %{version}-%{release}
diff --git a/contrib/crossrpms/autotools/rtems-4.9-automake.spec b/contrib/crossrpms/autotools/rtems-4.9-automake.spec
index cf561c797e..8e7ade04a9 100644
--- a/contrib/crossrpms/autotools/rtems-4.9-automake.spec
+++ b/contrib/crossrpms/autotools/rtems-4.9-automake.spec
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
-%define debug_package		%{nil}
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -49,7 +57,7 @@ URL:		http://sources.redhat.com/automake
 License:	GPL
 Group:		Development/Tools
 Version:	%{rpmvers}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
 Obsoletes:	rtems-4.9-automake-rtems < %{version}-%{release}