[xiphos] At least we configure now.

[Matej Cepl]

commit 8a6f1bfc01777a4efa7c9c19bb486ca6c2898986
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Jun 14 12:05:13 2011 +0200

    At least we configure now.

 xiphos-rawhide-gtkhtml3.patch |   29 ++++++++++++++++++++++++-----
 xiphos.spec                   |   11 +++++------
 2 files changed, 29 insertions(+), 11 deletions(-)
---
diff --git a/xiphos-rawhide-gtkhtml3.patch b/xiphos-rawhide-gtkhtml3.patch
index 51b0aac..6acb737 100644
--- a/xiphos-rawhide-gtkhtml3.patch
+++ b/xiphos-rawhide-gtkhtml3.patch
@@ -1,12 +1,22 @@
---- wscript	2010-10-15 17:41:01.000000000 -0400
-+++ wscript.new	2011-02-01 23:29:40.071379990 -0500
-@@ -310,12 +310,12 @@
+diff -up xiphos/wscript.gtkhtml3 xiphos/wscript
+--- xiphos/wscript.gtkhtml3	2011-05-18 16:48:10.000000000 +0200
++++ xiphos/wscript	2011-06-14 12:01:24.215293983 +0200
+@@ -1,7 +1,7 @@
+ #! /usr/bin/env python
+ # encoding: utf-8
+ 
+-import os, os.path
++import os, os.path, sys
+ import intltool
+ import string
+ import Utils
+@@ -310,12 +310,12 @@ def configure(conf):
      define('PACKAGE_SOURCE_DIR', conf.escpath(os.path.abspath(srcdir))) # foder where was wscript executed
  
  
 -    if conf.check_cfg(modversion='gtkhtml-editor-3.14',
 +    if conf.check_cfg(modversion='gtkhtml-editor-4.0',
-                       msg='Is post GNOME3 gtkhtml-editor available?',
+                       msg='Checking for GNOME3 gtkhtml-editor',
                        okmsg='Deffinatly',
                        errmsg='Probably, not'
                        ):
@@ -15,7 +25,7 @@
      else:
              editor='"gtkhtml-editor"'
  
-@@ -327,7 +327,7 @@
+@@ -327,7 +327,7 @@ def configure(conf):
      "glib-2.0"
      "libgsf-1 >= 1.14"
      "libxml-2.0"
@@ -24,3 +34,12 @@
      --cflags --libs'''
      .split()," ")
  
+@@ -381,7 +381,7 @@ def configure(conf):
+                                                     args='--modversion',
+                                                      okmsg=waffles.misc.myokmsg,
+                                                     msg="Checking for Gecko GREVersion").strip())
+-            if not env['GECKO_VER'][3].isalpha():
++            if not env['GECKO_VER'][-1].isalpha():
+                     conf.define('GECKO_MIN', env['GECKO_VER'][0:5]+'.0')
+                     conf.define('GECKO_MAX', env['GECKO_VER'][0:5]+'.99')
+             else:
diff --git a/xiphos.spec b/xiphos.spec
index 3ad2395..4606a84 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -6,16 +6,16 @@ Summary:	Bible study and research tool
 Group:		Applications/Text
 License:	GPLv2+
 URL:		http://xiphos.org/
-Source0:	http://downloads.sourceforge.net/project/gnomesword/Xiphos/%{version}/xiphos-%{version}.tar.gz
+#Source0:	http://downloads.sourceforge.net/project/gnomesword/Xiphos/%{version}/xiphos-%{version}.tar.gz
+Source0: xiphos-20110614svn4172.tar.bz2
 Patch0:		xiphos-rawhide-gtkhtml3.patch
-Patch1:		xiphos-xul-upper_ver.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.6.0
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtkhtml3-devel
+BuildRequires:	gtkhtml2-devel
 BuildRequires:	xulrunner-devel
 BuildRequires:	libglade2-devel libgnomeprintui22-devel
 BuildRequires:	libgsf-devel
@@ -35,9 +35,8 @@ environment for reading, study, and research using modules from The SWORD
 Project and elsewhere.
 
 %prep
-%setup -q
-%patch0 -p0 -b .gtkhtml3
-%patch1 -p0 -b .xul-upper_ver
+%setup -q -n %{name}
+%patch0 -p1 -b .gtkhtml3
 
 %build
 CFLAGS='%{optflags}' CXXFLAGS='%{optflags}' ./waf configure	\