[gconfmm26] fix FTBFS

[Haïkel Guémar]

commit 290aa7fdc94f62ab8c4402e0f9cb40df5d9d7f88
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Tue Oct 18 21:55:59 2011 +0200

    fix FTBFS

 gconfmm26-2.28.2-ftbfs.patch |   50 ++++++++++++++++++++++++++++++++++++++++++
 gconfmm26.spec               |   17 ++++++++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)
---
diff --git a/gconfmm26-2.28.2-ftbfs.patch b/gconfmm26-2.28.2-ftbfs.patch
new file mode 100644
index 0000000..1b41b24
--- /dev/null
+++ b/gconfmm26-2.28.2-ftbfs.patch
@@ -0,0 +1,50 @@
+From bba395097b51e4bf8c66a5ca344080f6188b227f Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Tue, 18 Oct 2011 18:39:35 +0300
+Subject: [PATCH] Avoid dependency on doc-install.pl. Bug #648860.
+
+* configure.ac: Distribute doc-install.pl with the tarball to
+avoid depending on mm-common for tarball builds.
+---
+ ChangeLog    |    7 +++++++
+ configure.ac |    7 ++++++-
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 4c3fa3a..10c1405 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2011-10-18  Kalev Lember  <kalevlember at gmail.com>
++
++vi-Avoid dependency on doc-install.pl. Bug #648860.
++
++vi-* configure.ac: Distribute doc-install.pl with the tarball to
++vi-avoid depending on mm-common for tarball builds.
++
+ 2.28.2:
+ 
+ 2010-06-04  Murray Cumming  <murrayc at murrayc.com>
+diff --git a/configure.ac b/configure.ac
+index fbcaf6f..7391c46 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,9 +30,14 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+ AM_MAINTAINER_MODE
+ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
+ 
+-MM_PREREQ([0.7.1])
++MM_PREREQ([0.9.5])
+ MM_INIT_MODULE([gconfmm-2.6])
+ 
++# Copy the mm-common .pl scripts into docs/,
++# and use them from there,
++# so we can dist them to avoid a tarball-build dependency.
++MM_CONFIG_DOCTOOL_DIR([docs])
++
+ # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+ AC_SUBST([LIBGCONFMM_SO_VERSION], [1:6:0])
+ 
+-- 
+1.7.6.4
+
diff --git a/gconfmm26.spec b/gconfmm26.spec
index 06524c7..1013a96 100644
--- a/gconfmm26.spec
+++ b/gconfmm26.spec
@@ -1,6 +1,6 @@
 Name:           gconfmm26
 Version:        2.28.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        C++ wrapper for GConf2
 
@@ -8,6 +8,8 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.28/gconfmm-%{version}.tar.bz2
+# https://bugzilla.gnome.org/show_bug.cgi?id=648860
+Patch0:         gconfmm26-2.28.2-ftbfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -38,6 +40,7 @@ interface to the GTK+.
 
 %prep
 %setup -q -n gconfmm-%{version}
+%patch0 -p1 -b .ftbfs
 # convert README file to UTF-8 
 iconv --from=ISO-8859-1 --to=UTF-8  README > README.new && \
 touch -r README README.new && \
@@ -53,7 +56,14 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
+# install documentation
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/gconfmm-2.6
+cp docs/reference/gconfmm-2.6.devhelp2 $RPM_BUILD_ROOT%{_datadir}/devhelp/books/gconfmm-2.6
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/gconfmm-2.6/reference/
+for i in html gconfmm-2.6.tag
+do
+    cp -r docs/reference/$i $RPM_BUILD_ROOT%{_datadir}/doc/gconfmm-2.6/reference/
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/gconfmm-2.6/reference/*
 
 %changelog
+* Tue Oct 18 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.28.2-3
+- fix FTBFS (patch from kalev)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.28.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild