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

[Karsten Hopp]

commit d5f9aac00532e7ddb0a71b076d0a803a85778401
Author: Karsten Hopp <karsten at redhat.com>
Date:   Mon Jul 4 15:32:11 2011 +0200

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

 libgdamm-4.1.2-doctooldir.patch |   24 ++++++++++++++++++++++++
 libgdamm.spec                   |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/libgdamm-4.1.2-doctooldir.patch b/libgdamm-4.1.2-doctooldir.patch
new file mode 100644
index 0000000..c7f2fac
--- /dev/null
+++ b/libgdamm-4.1.2-doctooldir.patch
@@ -0,0 +1,24 @@
+diff -up libgdamm-4.1.2/aclocal.m4.doctooldir libgdamm-4.1.2/aclocal.m4
+--- libgdamm-4.1.2/aclocal.m4.doctooldir	2011-07-04 15:21:16.571733381 +0200
++++ libgdamm-4.1.2/aclocal.m4	2011-07-04 15:22:46.325733393 +0200
+@@ -1134,7 +1134,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 libgdamm-4.1.2/configure.doctooldir libgdamm-4.1.2/configure
+--- libgdamm-4.1.2/configure.doctooldir	2011-07-04 15:21:25.126733383 +0200
++++ libgdamm-4.1.2/configure	2011-07-04 15:22:29.665733391 +0200
+@@ -15037,7 +15037,7 @@ $as_echo "$mm_all_flags" >&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/libgdamm.spec b/libgdamm.spec
index 7bcdbc9..ed6e6c9 100644
--- a/libgdamm.spec
+++ b/libgdamm.spec
@@ -2,14 +2,16 @@
 
 Name:		libgdamm
 Version:	4.1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	C++ wrappers for libgda
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://www.gtkmm.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgdamm/3.99/%{name}-%{version}.tar.bz2
+Patch0:     libgdamm-4.1.2-doctooldir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glibmm24-devel >= 2.12.8
+BuildRequires:	mm-common >= 0.9.5
 BuildRequires:  libgda-devel >= 4.1.7
 
 %description
@@ -39,6 +41,7 @@ This package contains the full API documentation for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .doctooldir
 
 %build
 %configure --disable-static
@@ -78,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 04 2011 Karsten Hopp <karsten at redhat.com> 4.1.2-2
+- buildrequire mm-common
+- fix pkg-config call to figure out doctooldir
+
 * Mon Feb 28 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 4.1.2-1
 - Update to upstream 4.1.2
 - put doc in sub-package