[sockperf/el6: 2/2] (EL6-specific) Make the spec file compatible with older rpm and autotools.

[Michal Schmidt]

commit 4be0d97aff92748b736d9bacde31f97b4ea71d7e
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Fri May 9 14:52:20 2014 +0200

    (EL6-specific) Make the spec file compatible with older rpm and autotools.

 sockperf.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/sockperf.spec b/sockperf.spec
index fae6a4e..690e7cd 100644
--- a/sockperf.spec
+++ b/sockperf.spec
@@ -1,6 +1,6 @@
 Name:           sockperf
 Version:        2.5.241
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Network benchmarking utility for testing latency and throughput
 
 License:        BSD
@@ -42,11 +42,10 @@ following:
   allow cleanest results.
 
 %prep
-# git_am will be available in a future rpm release.
-# http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=bf02debf73b4cad3aa344d5698af82c28619a248
-%{!?__scm_setup_git_am: %global __scm_setup_git_am(q) %%{expand:%%__scm_setup_git %%{-q}}}
-%{!?__scm_apply_git_am: %global __scm_apply_git_am(qp:m:) %%{__git} am %%{-q} %%{-p:-p%%{-p*}}}
-%autosetup -S git_am
+%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 # configure.ac invokes 'svnversion' to detect the exact version number.
@@ -55,6 +54,7 @@ following:
 VER_SVN=%{version}
 VER_SVN=${VER_SVN##*.}
 sed -i -e "s/svnversion \./echo $VER_SVN/" configure.ac
+mkdir -p config/m4
 autoreconf -fi
 %configure --enable-doc
 # --enable-tool --enable-test
@@ -68,10 +68,13 @@ make %{?_smp_mflags}
 %files
 %{_bindir}/sockperf
 %{_mandir}/man3/sockperf.3.*
-%{_pkgdocdir}
+%{_docdir}/%{name}
 
 
 %changelog
+* Fri May 09 2014 Michal Schmidt <mschmidt at redhat.com> - 2.5.241-3.el6.1
+- (EL6-specific) Make the spec file compatible with older rpm and autotools.
+
 * Thu Apr 24 2014 Michal Schmidt <mschmidt at redhat.com> - 2.5.241-3
 - Adjust the CXXFLAGS patch to drop all optimization flags changing.
 - Run autoreconf with -f to force regenerating config/aux.