From cbb5442adea8d7f9975e05c8e922bd858ae1fda8 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Jun 10 2011 20:49:31 +0000
Subject: - buildrequire mm-common for doc-install.pl

- fix configure and aclocal to check for mm-common-util before trying glibmm-2.4

---

diff --git a/libxml++-2.33.2-mm-common-utils.patch b/libxml++-2.33.2-mm-common-utils.patch
new file mode 100644
index 0000000..1e76c3f
--- /dev/null
+++ b/libxml++-2.33.2-mm-common-utils.patch
@@ -0,0 +1,40 @@
+diff -up libxml++-2.33.2/aclocal.m4.mm libxml++-2.33.2/aclocal.m4
+--- libxml++-2.33.2/aclocal.m4.mm	2011-06-10 19:45:35.365462680 +0200
++++ libxml++-2.33.2/aclocal.m4	2011-06-10 19:49:25.640462724 +0200
+@@ -1117,6 +1117,15 @@ dnl
+ AC_MSG_CHECKING([location of documentation utilities])
+ AS_IF([test "x$MMDOCTOOLDIR" = x],
+ [
++  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 mm-common-util could not be found on this system.
++Trying to figure out if glibmm-2.4 provides doctooldir.
++]])])
++])
++AS_IF([test "x$MMDOCTOOLDIR" = x],
++[
+   MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir glibmm-2.4 2>&AS_MESSAGE_LOG_FD`
+   AS_IF([test "[$]?" -ne 0],
+         [AC_MSG_ERROR([[not found
+diff -up libxml++-2.33.2/configure.mm libxml++-2.33.2/configure
+--- libxml++-2.33.2/configure.mm	2011-06-10 20:07:37.980462940 +0200
++++ libxml++-2.33.2/configure	2011-06-10 20:29:05.669463005 +0200
+@@ -15001,6 +15001,17 @@ $as_echo "#define LIBXMLCPP_EXCEPTIONS_E
+ $as_echo_n "checking location of documentation utilities... " >&6; }
+ if test "x$MMDOCTOOLDIR" = x; then :
+ 
++  MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir mm-common-util 2>&5`
++  if test "$?" -ne 0; then :
++  as_fn_error $? "not found
++            The required module mm-common-util could not be found on this system.
++            Trying to figure out if glibmm-2.4 provides doctooldir.
++" "$LINENO" 5
++fi
++fi
++
++if test "x$MMDOCTOOLDIR" = x; then :
++
+   MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir glibmm-2.4 2>&5`
+   if test "$?" -ne 0; then :
+   as_fn_error $? "not found
diff --git a/libxml++.spec b/libxml++.spec
index 953217d..453e642 100644
--- a/libxml++.spec
+++ b/libxml++.spec
@@ -1,7 +1,7 @@
 %global 	api_ver 2.6
 Name:           libxml++
 Version:        2.33.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -10,11 +10,13 @@ URL:            http://libxmlplusplus.sourceforge.net/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.26/libxml++-%{version}.tar.bz2
 #Patch0:		libxml++-2.33.1-autotools.patch
 Patch1:		libxml++-2.33.1-autotools2.patch
+Patch2:		libxml++-2.33.2-mm-common-utils.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel >= 2.6.1
 BuildRequires:  glibmm24-devel >= 2.4.0
 BuildRequires:  automake
+BuildRequires:  mm-common
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
@@ -47,6 +49,8 @@ This package contains the full API documentation for %{name}.
 ## actually the regeneration of libxml++ autotools scripts is broken
 ## use patch1 as a substitute to patch0
 %patch1 -p1
+## doc-utils moved from glibmm24 to mm-common, fix pkg-config call
+%patch2 -p1
 # regenerate Makefile.in since we modified Makefile.am
 #automake -v
 # fix wrong end of line
@@ -99,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 10 2011 Karsten Hopp <karsten@redhat.com> 2.33.2-2
+- buildrequire mm-common for doc-install.pl
+- fix configure and aclocal to check for mm-common-util before trying glibmm-2.4
+
 * Tue Feb 22 2011 Haïkel Guémar <hguemar@fedoraproject.org> - 2.33.2-1
 - Update to upstream 2.33.2
 - split doc into sub-package