m4: bump and add epel-rpm-macros deps

2 files changed, 8 insertions, 17 deletions

diff --git a/repos/autotools/autotools-git/m4/m4.spec b/repos/autotools/autotools-git/m4/m4.spec
index 310d141..c742a14 100644
--- a/repos/autotools/autotools-git/m4/m4.spec
+++ b/repos/autotools/autotools-git/m4/m4.spec
@@ -1,5 +1,3 @@
-%{?_compat_el5_build}
-
 %{!?scl:%global scl autotools-git}
 
 %{?scl:%scl_package m4}
@@ -10,7 +8,7 @@
 Summary: The GNU macro processor
 Name: %{scl_prefix}m4
 Version: 1.9a
-Release: 5.%(echo %upstream_stamp | sed 's|-|_|')%{?dist}
+Release: 6.%(echo %upstream_stamp | sed 's|-|_|')%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source0: m4-%{version}.%{upstream_stamp}.tar.gz
@@ -28,11 +26,6 @@ BuildRequires: scl-utils-build
 Requires:%scl_runtime
 }
 
-# RHEL5 WA for not-defined buildroot
-%if ! 0%{?buildroot:1}
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-%global buildroot %{_tmppath}/%{name}-%{version}-root
-%endif
 
 %description
 A GNU implementation of the traditional UNIX macro processor.  M4 is
@@ -92,6 +85,9 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Tue Sep 27 2016 Pavel Raiskup <praiskup@redhat.com> - 1.9a-6.678_c9436
+- bump, use epel-rpm-macros
+
 * Thu Jun 16 2016 Pavel Raiskup <praiskup@redhat.com> - 1.9a-5.678_c9436
 - update to latest HEAD
 
diff --git a/repos/autotools/autotools-latest/m4/m4.spec b/repos/autotools/autotools-latest/m4/m4.spec
index e243b04..ea76f50 100644
--- a/repos/autotools/autotools-latest/m4/m4.spec
+++ b/repos/autotools/autotools-latest/m4/m4.spec
@@ -1,5 +1,3 @@
-%{?_compat_el5_build}
-
 %{!?scl:%global scl autotools-latest}
 
 %{?scl:%scl_package m4}
@@ -7,7 +5,7 @@
 Summary: The GNU macro processor
 Name: %{scl_prefix}m4
 Version: 1.4.17
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.gz
@@ -30,12 +28,6 @@ BuildRequires: scl-utils-build
 Requires:%scl_runtime
 }
 
-# RHEL5 WA for not-defined buildroot
-%if ! 0%{?buildroot:1}
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-%global buildroot %{_tmppath}/%{name}-%{version}-root
-%endif
-
 %description
 A GNU implementation of the traditional UNIX macro processor.  M4 is
 useful for writing text files which can be logically parsed, and is used
@@ -82,6 +74,9 @@ fi
 
 
 %changelog
+* Tue Sep 27 2016 Pavel Raiskup <praiskup@redhat.com> - 1.4.17-6
+- bump
+
 * Fri Jun 17 2016 Pavel Raiskup <praiskup@redhat.com> - 1.4.17-5
 - bump