[gtk+extra/f14/master] Fix configure, make and marshall build issues

[Roy Rankin]

commit d34decf2ef421e0ef1b100c92e40c604cdb9469f
Author: Roy Rankin <rrankin at ihug.com.au>
Date:   Tue Sep 14 20:46:18 2010 +1000

    Fix configure, make and marshall build issues

 gtk+extra-2.1.2-make.patch    |   32 ++++++++++++++++++++++++++++++++
 gtk+extra-2.1.2-marshal.patch |    9 +++++++++
 gtk+extra.spec                |   16 ++++++++++++++--
 3 files changed, 55 insertions(+), 2 deletions(-)
---
diff --git a/gtk+extra-2.1.2-make.patch b/gtk+extra-2.1.2-make.patch
new file mode 100644
index 0000000..871d05a
--- /dev/null
+++ b/gtk+extra-2.1.2-make.patch
@@ -0,0 +1,32 @@
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/gtkextra/gtkextra-2/configure.in,v
+retrieving revision 1.15
+diff -r1.15 configure.in
+36a37,39
+> AC_SUBST(LT_CURRENT)
+> AC_SUBST(LT_REVISION)
+> AC_SUBST(LT_AGE)
+61a65,66
+> AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+> 
+Index: gtkextra/Makefile.am
+===================================================================
+RCS file: /cvsroot/gtkextra/gtkextra-2/gtkextra/Makefile.am,v
+retrieving revision 1.17
+diff -r1.17 Makefile.am
+186a187,188
+> 
+> 
+200c202
+<         ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
+---
+> 	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
+204c206
+<         ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
+---
+> 	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
+284c286
+<         builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; export HAVE_PROGRESSBAR=1; \
+---
+> 	builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; export HAVE_PROGRESSBAR=1; \
diff --git a/gtk+extra-2.1.2-marshal.patch b/gtk+extra-2.1.2-marshal.patch
new file mode 100644
index 0000000..fc203c1
--- /dev/null
+++ b/gtk+extra-2.1.2-marshal.patch
@@ -0,0 +1,9 @@
+Index: gtkextra/gtkcolorcombo.c
+===================================================================
+RCS file: /cvsroot/gtkextra/gtkextra-2/gtkextra/gtkcolorcombo.c,v
+retrieving revision 1.5
+diff -r1.5 gtkcolorcombo.c
+149c149
+<                                       gtkextra_VOID__INT_BOXED,
+---
+>                                       gtkextra_VOID__BOXED_BOXED,
diff --git a/gtk+extra.spec b/gtk+extra.spec
index cf488e1..116615d 100644
--- a/gtk+extra.spec
+++ b/gtk+extra.spec
@@ -1,6 +1,6 @@
 Name:		gtk+extra
 Version:	2.1.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A library of gtk+ widgets
 Summary(fr):	Une bibliothèque de widgets gtk+
 
@@ -9,9 +9,11 @@ License:	LGPLv2+
 URL:		http://gtkextra.sourceforge.net/
 Source:		http://downloads.sourceforge.net/gtkextra/gtk+extra-%{version}.tar.gz
 Patch:		%{name}-%{version}-gtk2.21.patch
+Patch1:		%{name}-%{version}-make.patch
+Patch2:		%{name}-%{version}-marshal.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk2-devel
+BuildRequires:	gtk2-devel libtool gtk-doc
 
 %description
 A library of dynamically linked gtk+ widgets including:
@@ -45,7 +47,14 @@ qui utilisent les widgets gtk+extra.
 %{__sed} -i 's/\r//' docs/tutorial/{*.html,gtksheet/*.{c,html}}
 
 %patch -p0
+%patch1 -p0
+%patch2 -p0
+libtoolize --force
+aclocal
+autoheader
 
+autoreconf
+automake 
 
 %build
 %configure
@@ -83,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 14 2010 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.2-3
+- Patches to configuration, Makefile and marshall
+
 * Sat Jun 12 2010 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.2-2
 - Patch to compile with gtk2-2.21