From 77295577162758b3b14a2692728a3882efb7aa01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 29 Jul 2015 11:22:15 +0000
Subject: [PATCH] build fixes for rpm - centos 5/6 don't know m4_esyscmd_s

---
 ax_init_standard_project.m4 | 16 ++++++++--------
 mrw-c++.spec.in             |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 39242af..965793b 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -5,7 +5,7 @@
 
 # define least version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
-m4_define(x_least, m4_esyscmd_s(
+m4_define(x_least, m4_esyscmd([
   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
@@ -16,11 +16,11 @@ m4_define(x_least, m4_esyscmd_s(
   done
   # Mac does not support LEAST > 255
   echo $ECHO_N $(($SVN_REVISION%256))
-))
+]))
 # define version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
 # add to x_minor if revision number is > 256
-m4_define(x_minor_fixed, m4_esyscmd_s(
+m4_define(x_minor_fixed, m4_esyscmd([
   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
@@ -31,17 +31,17 @@ m4_define(x_minor_fixed, m4_esyscmd_s(
   done
   # Mac does not support LEAST > 255
   echo $ECHO_N $((x_minor+$SVN_REVISION/256))
-))
+]))
 # setup version number
-m4_define(x_version, m4_esyscmd_s(
+m4_define(x_version, m4_esyscmd([
   echo $ECHO_N x_major.x_minor_fixed.x_least
-))
+]))
 
 ## bugreport mail address is taken from <user@host> in first line of AUTHORS
-m4_define(x_bugreport, m4_esyscmd_s(
+m4_define(x_bugreport, m4_esyscmd([
   head -1 AUTHORS | \
     sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp'
-))
+]))
 
 m4_include(ax_check_qt.m4)
 
diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in
index 1c270ab..60926d0 100644
--- a/mrw-c++.spec.in
+++ b/mrw-c++.spec.in
@@ -11,7 +11,7 @@ BuildRequires: graphviz
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
-BuildRequires: pkgconfig, cppunit-devel, redhat-lsb
+BuildRequires: pkgconfig, cppunit-devel, redhat-lsb, subversion-svn2cl
 %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
 BuildRequires: mscgen
 %endif