From 242552ab32859b065ac067a60aad954807274c29 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Sun, 10 Dec 2006 03:08:41 +0000
Subject: [PATCH] - Add patch for GNOME bug #355521 (look for local m4 files).

---
 gnome-doc-utils-0.8.0-aclocal-flags.patch | 22 ++++++++++++++
 gnome-doc-utils.spec                      | 35 +++++++++++++++++------
 2 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 gnome-doc-utils-0.8.0-aclocal-flags.patch

diff --git a/gnome-doc-utils-0.8.0-aclocal-flags.patch b/gnome-doc-utils-0.8.0-aclocal-flags.patch
new file mode 100644
index 0000000..4d106b1
--- /dev/null
+++ b/gnome-doc-utils-0.8.0-aclocal-flags.patch
@@ -0,0 +1,22 @@
+--- gnome-doc-utils-0.8.0/Makefile.in.aclocal-flags	2006-12-09 21:56:54.000000000 -0500
++++ gnome-doc-utils-0.8.0/Makefile.in	2006-12-09 21:57:18.000000000 -0500
+@@ -374,6 +374,8 @@
+ # doc must go last
+ SUBDIRS = po xslt $(xml2po_SUBDIRS) doc
+ 
++ACLOCAL_AMFLAGS=-I .
++
+ EXTRA_DIST = \
+ 	$(aclocal_DATA)					\
+ 	$(share_DATA)					\
+--- gnome-doc-utils-0.8.0/Makefile.am.aclocal-flags	2006-04-23 18:44:38.000000000 -0400
++++ gnome-doc-utils-0.8.0/Makefile.am	2006-12-09 21:56:29.000000000 -0500
+@@ -30,6 +30,8 @@
+ # doc must go last
+ SUBDIRS = po xslt $(xml2po_SUBDIRS) doc
+ 
++ACLOCAL_AMFLAGS=-I .
++
+ EXTRA_DIST = 						\
+ 	$(aclocal_DATA)					\
+ 	$(share_DATA)					\
diff --git a/gnome-doc-utils.spec b/gnome-doc-utils.spec
index 25d250a..db183eb 100644
--- a/gnome-doc-utils.spec
+++ b/gnome-doc-utils.spec
@@ -1,21 +1,35 @@
-Summary: Documentation utilities for the GNOME project
+### Abstract ###
+
 Name: gnome-doc-utils
 Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: Development/Tools
+Summary: Documentation utilities for the GNOME project
 URL: http://www.gnome.org/
-Source0: %{name}-%{version}.tar.bz2
-BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildPrereq: libxml2-devel >= 2.6.12
-BuildPrereq: libxslt-devel >= 1.1.8
-BuildRequires: perl-XML-Parser
-BuildRequires: gettext
+Source: %{name}-%{version}.tar.bz2
+
+BuildArch: noarch
+
+### Patches ###
+
+# GNOME bug #355521
+Patch1: gnome-doc-utils-0.8.0-aclocal-flags.patch
+
+### Dependencies ###
+
 Requires: libxml2 >= 2.6.12
 Requires: libxslt >= 1.1.8
 Requires: libxml2-python
 
+### Build Dependencies ###
+
+BuildPrereq: libxml2-devel >= 2.6.12
+BuildPrereq: libxslt-devel >= 1.1.8
+
+BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 
 %description
 gnome-doc-utils is a collection of documentation utilities for the GNOME
@@ -25,6 +39,7 @@ XSLT stylesheets that were once distributed with Yelp.
 
 %prep
 %setup -q
+%patch1 -p1 -b .aclocal-flags
 
 %build
 %configure --disable-scrollkeeper
@@ -43,7 +58,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README NEWS
@@ -60,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Sat Dec 09 2006 Matthew Barnes <mbarnes@redhat.com> - 0.8.0-3
+- Add patch for GNOME bug #355521 (look for local m4 files).
+
 * Fri Sep  8 2006 Matthias Clasen <mclasen@redhat.com> - 0.8.0-2
 - Fix some directory ownership issues  (#205677)