From 4fdc7864c1ab620d10397ea83ab2063b26782cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 29 Jul 2015 12:27:11 +0000
Subject: [PATCH] build fixes for rpm

---
 ax_init_standard_project.m4 | 2 --
 bootstrap.sh                | 1 +
 mrw-c++.spec.in             | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index a65a213..24b7568 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -13,7 +13,6 @@ m4_define(x_least, mrw_esyscmd_s([
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      (cd $path && svn2cl) 2> /dev/null  > /dev/null
       break;
     fi
   done
@@ -28,7 +27,6 @@ m4_define(x_minor_fixed, mrw_esyscmd_s([
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      (cd $path && svn2cl) 2> /dev/null  > /dev/null
       break;
     fi
   done
diff --git a/bootstrap.sh b/bootstrap.sh
index 27c78d7..c347b3d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -839,6 +839,7 @@ if test -f makefile; then
 fi
 
 #### Bootstrap Before Configure ####
+run --no-check svn2cl
 run aclocal
 run libtoolize --force
 run automake -a
diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in
index 122ed10..1c270ab 100644
--- a/mrw-c++.spec.in
+++ b/mrw-c++.spec.in
@@ -11,12 +11,12 @@ 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: subversion-svn2cl, pkgconfig, cppunit-devel, redhat-lsb
+BuildRequires: pkgconfig, cppunit-devel, redhat-lsb
 %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
 BuildRequires: mscgen
 %endif
 %else%if 0%{?suse_version} || 0%{?sles_version}
-BuildRequires: svn2cl, pkg-config, libcppunit-devel, lsb-release
+BuildRequires: pkg-config, libcppunit-devel, lsb-release
 %endif%endif
 
 %description