[xiphos/f21] New upstream version 3.2.2

[Greg Hellings]

commit 8dc3b2d6b657db9dcc558aff3c11fd2728910fd9
Author: Greg Hellings <greg.hellings at gmail.com>
Date:   Mon Aug 25 22:08:24 2014 -0500

    New upstream version 3.2.2
    
    Conflicts:
    	xiphos.spec

 .gitignore  |    1 +
 sources     |    2 +-
 xiphos.spec |   49 ++++++++++++++++++++++++++++---------------------
 3 files changed, 30 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d63ca5f..f41c7a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xiphos-3.1.3.tar.gz
 /xiphos-3.1.6.tar.gz
 /xiphos-3.2.0.tar.gz
 /xiphos-3.2.1.tar.gz
+/xiphos-3.2.2.tar.gz
diff --git a/sources b/sources
index eb86caf..87a4455 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b420231baa72f0307bd73e687a8add27  xiphos-3.2.1.tar.gz
+9aaca7380b1537d2b0e6bcc0ab758663  xiphos-3.2.2.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index 223d489..de9aad0 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,21 +1,26 @@
-Name:		xiphos 
-Version:	3.2.1
-Release:	2%{?dist}
-Summary:	Bible study and research tool
-
-Group:		Applications/Text
-License:	GPLv2+
-URL:		http://xiphos.org/
-Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
-Patch0:     format-warning.patch
-BuildRequires:	sword-devel >= 1.7.3
-BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
-BuildRequires:	gnome-doc-utils
-BuildRequires:	gtkhtml3-devel GConf2-devel
-BuildRequires:	webkitgtk-devel
-BuildRequires:	libgsf-devel
-BuildRequires:	dbus-glib-devel
+
+Name:           xiphos 
+Version:        3.2.2
+Release:        1%{?dist}
+Summary:        Bible study and research tool
+License:        GPLv2+
+URL:            http://xiphos.org/
+Source0:        http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
+BuildRequires:  biblesync-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  dbus-glib-devel
+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:	ImageMagick-c++-devel
 BuildRequires:	perl(XML::Parser) intltool
@@ -34,8 +39,7 @@ Project and elsewhere.
 
 %prep
 %setup -q
-
-%patch0 -p1
+rm -rf src/biblesync
 
 %build
 CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' ./waf configure	\
@@ -82,7 +86,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %_datadir/gnome/help/xiphos
 
 %changelog
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-2
+* Mon Aug 25 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.2-1
+- New upstream version
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
 * Tue Jun 10 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.1-1