[goocanvasmm] buildrequire mm-common fix pkg-config call to figure out doctooldir

[Karsten Hopp]

commit e4892007f1d18f659f812a6f4e8d9017baa875e1
Author: Karsten Hopp <karsten at redhat.com>
Date:   Mon Jul 4 16:19:43 2011 +0200

    buildrequire mm-common
    fix pkg-config call to figure out doctooldir

 goocanvasmm-0.15.4-doctooldir.patch |   24 ++++++++++++++++++++++++
 goocanvasmm.spec                    |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/goocanvasmm-0.15.4-doctooldir.patch b/goocanvasmm-0.15.4-doctooldir.patch
new file mode 100644
index 0000000..0e82d43
--- /dev/null
+++ b/goocanvasmm-0.15.4-doctooldir.patch
@@ -0,0 +1,24 @@
+diff -up goocanvasmm-0.15.4/aclocal.m4.doctooldir goocanvasmm-0.15.4/aclocal.m4
+--- goocanvasmm-0.15.4/aclocal.m4.doctooldir	2011-07-04 16:09:44.718733765 +0200
++++ goocanvasmm-0.15.4/aclocal.m4	2011-07-04 16:10:59.415733773 +0200
+@@ -1035,7 +1035,7 @@ dnl
+ AC_MSG_CHECKING([location of documentation utilities])
+ AS_IF([test "x$MMDOCTOOLDIR" = x],
+ [
+-  MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir glibmm-2.4 2>&AS_MESSAGE_LOG_FD`
++  MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir mm-common-util 2>&AS_MESSAGE_LOG_FD`
+   AS_IF([test "[$]?" -ne 0],
+         [AC_MSG_ERROR([[not found
+ The required module glibmm could not be found on this system.  If you
+diff -up goocanvasmm-0.15.4/configure.doctooldir goocanvasmm-0.15.4/configure
+--- goocanvasmm-0.15.4/configure.doctooldir	2011-07-04 16:09:46.470733765 +0200
++++ goocanvasmm-0.15.4/configure	2011-07-04 16:10:46.246733772 +0200
+@@ -14940,7 +14940,7 @@ $as_echo "$GMMPROC_DIR" >&6; }
+ $as_echo_n "checking location of documentation utilities... " >&6; }
+ if test "x$MMDOCTOOLDIR" = x; then :
+ 
+-  MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir glibmm-2.4 2>&5`
++  MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir mm-common-util 2>&5`
+   if test "$?" -ne 0; then :
+   as_fn_error "not found
+ The required module glibmm could not be found on this system.  If you
diff --git a/goocanvasmm.spec b/goocanvasmm.spec
index dcc0e49..56c97d7 100644
--- a/goocanvasmm.spec
+++ b/goocanvasmm.spec
@@ -2,7 +2,7 @@
 
 Name:           goocanvasmm
 Version:        0.15.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        C++ interface for goocanvas
 
@@ -10,11 +10,13 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.15/%{name}-%{version}.tar.bz2
+Patch0:         goocanvasmm-0.15.4-doctooldir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibmm24-devel >= 2.14.2
 BuildRequires:  gtkmm24-devel >= 2.22.0
 BuildRequires:  goocanvas-devel >= 0.15
+BuildRequires:  mm-common >= 0.9.5
 
 
 %description
@@ -57,6 +59,7 @@ If using a web browser the documentation is at
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -103,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 04 2011 Karsten Hopp <karsten at redhat.com> 0.15.4-5
+- buildrequire mm-common
+- fix pkg-config call to figure out doctooldir
+
 * Mon Feb 28 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 0.15.4-4
 - bump release