rpms/gnomesword/devel gnomesword-no_gtkhtml_idl.patch, NONE, 1.1 gnomesword.spec, 1.44, 1.45

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3831

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-no_gtkhtml_idl.patch 
Log Message:
Apply patch to build with latest gtkhtml


gnomesword-no_gtkhtml_idl.patch:

--- NEW FILE gnomesword-no_gtkhtml_idl.patch ---
--- src/editor/Makefile.am	2008-05-26 18:58:39.000000000 -0400
+++ src/editor/Makefile.am.new	2008-05-27 23:00:58.000000000 -0400
@@ -16,10 +16,10 @@
 	Editor-skels.c	\
 	Editor-stubs.c
 
-Editor-commmon.c: $(GTKHTML_DATA_DIR)/Editor.idl
+#Editor-commmon.c: $(GTKHTML_DATA_DIR)/Editor.idl
 
-$(HTML_EDITOR_GENERATED): $(GTKHTML_DATA_DIR)/Editor.idl
-	$(ORBIT_IDL) -I $(srcdir) $(BONOBO_IDL_INCLUDES) -I $(GTKHTML_DATA_DIR)/gtkhtml $(GTKHTML_DATA_DIR)/Editor.idl
+#$(HTML_EDITOR_GENERATED): $(GTKHTML_DATA_DIR)/Editor.idl
+#	$(ORBIT_IDL) -I $(srcdir) $(BONOBO_IDL_INCLUDES) -I $(GTKHTML_DATA_DIR)/gtkhtml $(GTKHTML_DATA_DIR)/Editor.idl
 
 
 
--- src/editor/Makefile.in	2008-05-26 18:59:44.000000000 -0400
+++ src/editor/Makefile.in.new	2008-05-27 23:01:24.000000000 -0400
@@ -547,10 +547,10 @@
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
-Editor-commmon.c: $(GTKHTML_DATA_DIR)/Editor.idl
+#Editor-commmon.c: $(GTKHTML_DATA_DIR)/Editor.idl
 
-$(HTML_EDITOR_GENERATED): $(GTKHTML_DATA_DIR)/Editor.idl
-	$(ORBIT_IDL) -I $(srcdir) $(BONOBO_IDL_INCLUDES) -I $(GTKHTML_DATA_DIR)/gtkhtml $(GTKHTML_DATA_DIR)/Editor.idl
+#$(HTML_EDITOR_GENERATED): $(GTKHTML_DATA_DIR)/Editor.idl
+#	$(ORBIT_IDL) -I $(srcdir) $(BONOBO_IDL_INCLUDES) -I $(GTKHTML_DATA_DIR)/gtkhtml $(GTKHTML_DATA_DIR)/Editor.idl
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnomesword.spec	27 May 2008 02:08:03 -0000	1.44
+++ gnomesword.spec	28 May 2008 03:06:03 -0000	1.45
@@ -7,6 +7,7 @@
 License:	GPLv2+
 URL:		http://gnomesword.sourceforge.net/
 Source0:	http://dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:		gnomesword-no_gtkhtml_idl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.5.11
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .idl
 
 %build
 %configure --enable-exporter --enable-gtkhtml