[oprofile] Avoid the false match for automake version.

[William Eden Cohen]

commit e4802c6e2963f0d1583d1e76d5296e5bc082813c
Author: William Cohen <wcohen at redhat.com>
Date:   Thu Apr 5 10:22:44 2012 -0400

    Avoid the false match for automake version.

 oprofile-autogen.patch |   31 +++++++++++++++++++++++++++++++
 oprofile.spec          |    7 ++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/oprofile-autogen.patch b/oprofile-autogen.patch
new file mode 100644
index 0000000..18e3b4e
--- /dev/null
+++ b/oprofile-autogen.patch
@@ -0,0 +1,31 @@
+From 646fbe51d925a4eac45009bda2c2fcb1b26e8a70 Mon Sep 17 00:00:00 2001
+From: William Cohen <wcohen at redhat.com>
+Date: Thu, 5 Apr 2012 08:33:08 -0400
+Subject: [PATCH] Make autogen.sh a bit more discriminating on automake
+ version
+
+Fedora Rawhide has automake version 1.11.4 which has the substring "1.4"
+in it. This would cause autogen.sh to fail. Made the grep in autogen.sh
+more discriminating to avoid the incorrect matches.
+
+Signed-off-by: William Cohen <wcohen at redhat.com>
+---
+ autogen.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 5148e80..40d09d0 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -21,7 +21,7 @@ AUTOHEADER=${AUTOHEADER:-autoheader}
+ AUTOMAKE=${AUTOMAKE:-automake}
+ AUTOCONF=${AUTOCONF:-autoconf}
+ 
+-if $AUTOMAKE --version | grep -q 1.4
++if $AUTOMAKE --version | grep -q " 1.4$"
+ 	then
+ 	echo ""
+ 	echo "Automake 1.4 not supported. please set \$AUTOMAKE"
+-- 
+1.7.9.5
+
diff --git a/oprofile.spec b/oprofile.spec
index d6d8629..ce59024 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/System
 #
@@ -12,6 +12,7 @@ Requires(pre): shadow-utils
 Requires(postun): shadow-utils
 Patch10: oprofile-0.4-guess2.patch
 Patch83: oprofile-0.9.7-xen.patch
+Patch200: oprofile-autogen.patch
 
 URL: http://oprofile.sf.net
 
@@ -75,6 +76,7 @@ agent library.
 %setup -q -n %{name}-%{version}
 %patch10 -p1 -b .guess2
 %patch83 -p1 -b .xen
+%patch200 -p1 -b .autogen
 
 ./autogen.sh
 
@@ -186,6 +188,9 @@ exit 0
 %{_sysconfdir}/ld.so.conf.d/*
 
 %changelog
+* Thu Apr 04 2012 Will Cohen <wcohen at redhat.com> - 0.9.7-4
+- Fix autogen.sh to avoid false match.
+
 * Thu Apr 04 2012 Will Cohen <wcohen at redhat.com> - 0.9.7-3
 - Use correct macros for /etc and /user/share. rhbz #226222
 - Consistently use macros for buildroot.