From 8ec9348f8954f67dce46256002da7f874301cdd4 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Dec 21 2010 10:22:53 +0000
Subject: Add patch for a build break


---

diff --git a/gtkhtml-3.91.4-buildbreak.patch b/gtkhtml-3.91.4-buildbreak.patch
new file mode 100644
index 0000000..f3a23ef
--- /dev/null
+++ b/gtkhtml-3.91.4-buildbreak.patch
@@ -0,0 +1,63 @@
+commit 63c5ce0bd5941f8b24169968e0708a7150e2f5a4
+Author: Milan Crha <mcrha@redhat.com>
+Date:   Tue Dec 21 10:05:32 2010 +0100
+
+    Fix a build break of the editor
+
+commit 2359eb43401479cb1360e9f6ecb4f72e49dc6b53
+
+    Fix version mismatch in gtkhtml-editor.pc.in
+
+diff --git a/components/editor/Makefile.am b/components/editor/Makefile.am
+index fece61c..6736bd0 100644
+--- a/components/editor/Makefile.am
++++ b/components/editor/Makefile.am
+@@ -21,7 +21,7 @@ BUILT_SOURCES = \
+ 	gtkhtml-spell-marshal.c			\
+ 	gtkhtml-spell-marshal.h
+ 
+-libgtkhtml_editordir = $(includedir)/libgtkhtml-@EDITOR_API_VERSION@/editor
++libgtkhtml_editordir = $(includedir)/libgtkhtml-@GTKHTML_API_VERSION@/editor
+ 
+ csources = 					\
+ 	$(BUILT_SOURCES)			\
+@@ -68,14 +68,14 @@ lib_LTLIBRARIES = libgtkhtml-editor-4.0.la
+ libgtkhtml_editor_4_0_la_SOURCES = $(csources) 
+ libgtkhtml_editor_4_0_la_LIBADD = \
+ 	@GTKHTML_LIBS@				\
+-	$(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
++	$(top_builddir)/gtkhtml/libgtkhtml-@GTKHTML_API_VERSION@.la
+ libgtkhtml_editor_4_0_la_LDFLAGS = -no-undefined
+ else
+ lib_LTLIBRARIES = libgtkhtml-editor-3.14.la
+ libgtkhtml_editor_3_14_la_SOURCES = $(csources) 
+ libgtkhtml_editor_3_14_la_LIBADD = \
+ 	@GTKHTML_LIBS@				\
+-	$(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
++	$(top_builddir)/gtkhtml/libgtkhtml-@GTKHTML_API_VERSION@.la
+ libgtkhtml_editor_3_14_la_LDFLAGS = -no-undefined
+ endif
+ 
+@@ -84,7 +84,7 @@ gtkhtml_editor_test_SOURCES = main.c
+ gtkhtml_editor_test_LDADD = \
+ 	@GTKHTML_LIBS@				\
+ 	libgtkhtml-editor-@EDITOR_API_VERSION@.la			\
+-	$(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
++	$(top_builddir)/gtkhtml/libgtkhtml-@GTKHTML_API_VERSION@.la
+ 
+ gtkhtml-editor-marshal.h: gtkhtml-editor-marshal.list $(GLIB_GENMARSHAL)
+ 	$(GLIB_GENMARSHAL) $< --header --prefix=gtkhtml_editor_marshal > $@
+diff --git a/components/editor/gtkhtml-editor.pc.in b/components/editor/gtkhtml-editor.pc.in
+index 8f388c6..88d80bd 100644
+--- a/components/editor/gtkhtml-editor.pc.in
++++ b/components/editor/gtkhtml-editor.pc.in
+@@ -7,7 +7,7 @@ gtkhtml_api_version=@EDITOR_API_VERSION@
+ 
+ Name: gtkhtml-editor
+ Description: HTML editor widget
+-Requires: libgtkhtml-@EDITOR_API_VERSION@
++Requires: libgtkhtml-@GTKHTML_API_VERSION@
+ Version: @VERSION@
+ Libs: -L${libdir} -lgtkhtml-editor-@EDITOR_API_VERSION@
+-Cflags: -I${includedir}/libgtkhtml-@EDITOR_API_VERSION@/editor
++Cflags: -I${includedir}/libgtkhtml-@GTKHTML_API_VERSION@/editor
diff --git a/gtkhtml3.spec b/gtkhtml3.spec
index f5c3c13..3a86455 100644
--- a/gtkhtml3.spec
+++ b/gtkhtml3.spec
@@ -1,4 +1,5 @@
-%define gtkhtml_major 3.14
+%define gtkhtml_major 3.15
+%define editor_major 3.14
 
 ### Abstract ###
 
@@ -11,6 +12,11 @@ License: LGPLv2+ and GPLv2
 URL: http://projects.gnome.org/evolution/
 Source: http://download.gnome.org/sources/gtkhtml/3.91/gtkhtml-%{version}.tar.bz2
 
+### Patches ###
+
+# Build break
+Patch01: gtkhtml-3.91.4-buildbreak.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -41,6 +47,8 @@ developing applications that use %{name}.
 %prep
 %setup -q -n gtkhtml-%{version}
 
+%patch01 -p1 -b .buildbreak
+
 %build
 %configure --disable-static
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -60,19 +68,20 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %doc AUTHORS ChangeLog NEWS README COPYING TODO
 %{_bindir}/gtkhtml-editor-test
 %{_libdir}/libgtkhtml-%{gtkhtml_major}.so.*
-%{_libdir}/libgtkhtml-editor-%{gtkhtml_major}.so.*
+%{_libdir}/libgtkhtml-editor-%{editor_major}.so.*
 %{_datadir}/gtkhtml-%{gtkhtml_major}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/libgtkhtml-%{gtkhtml_major}
 %{_libdir}/libgtkhtml-%{gtkhtml_major}.so
-%{_libdir}/libgtkhtml-editor-%{gtkhtml_major}.so
+%{_libdir}/libgtkhtml-editor-%{editor_major}.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
 * Mon Dec 20 2010 Milan Crha <mcrha@redhat.com> - 3.91.4-1
 - Update to 3.91.4
+- Add patch for a build break
 
 * Mon Nov 29 2010 Milan Crha <mcrha@redhat.com> - 3.91.3-1
 - Update to 3.91.3