[xiphos/epel7] New upstream and EPEL7 version

[Greg Hellings]

commit 9738d6a9bd5fc3a104b03a5eda9ec4ab4c2875f0
Author: Greg Hellings <greg.hellings at gmail.com>
Date:   Mon Dec 1 23:44:34 2014 -0600

    New upstream and EPEL7 version

 xiphos.spec |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/xiphos.spec b/xiphos.spec
index 2ef4274..6ff8d1e 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,6 +1,6 @@
 Name:           xiphos 
-Version:        3.2.1
-Release:        2%{?dist}
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        Bible study and research tool
 License:        GPLv2+
 URL:            http://xiphos.org/
@@ -13,23 +13,13 @@ BuildRequires:  docbook-utils
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 BuildRequires:  gnome-doc-utils
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
-BuildRequires:  libglade2-devel
-%else
 BuildRequires:  gtk3-devel
-%endif
-BuildRequires:  gtkhtml3-devel
 BuildRequires:  intltool
 BuildRequires:  libgsf-devel
 BuildRequires:  libuuid-devel
-#BuildRequires:	perl(XML::Parser)
 BuildRequires:  rarian-compat
 BuildRequires:  sword-devel >= 1.7.3
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
-BuildRequires:  webkitgtk-devel
-%else
 BuildRequires:  webkitgtk3-devel
-%endif
 Requires:       yelp
 Obsoletes:      gnomesword < 2.4.2-1
 Provides:       gnomesword = %{version}-%{release}
@@ -50,12 +40,9 @@ CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \
 LDFLAGS='%{?__global_ldflags}'                              \
 ./waf configure	                     \
         --prefix=%{_prefix}          \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
-        --gtk=2                      \
-%else
         --gtk=3                      \
-%endif
-        --enable-webkit || cat build/config.log
+        --enable-webkit              \
+        --enable-webkit-editor || cat build/config.log
 
 ./waf build -v
 
@@ -97,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/xiphos/
 
 %changelog
+* Mon Dec 01 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.2-1
+- New upstream release and branch for EPEL7
+
 * Sat Aug 02 2014 Christopher Meng <rpm at cicku.me> - 3.2.1-2
 - Build against GTK+3