[xiphos: 1/2] New upstream release.

[Greg Hellings]

commit 019c4451177f628d57a3016921bb6899de6cc072
Author: Greg Hellings <greg.hellings at gmail.com>
Date:   Tue Jun 10 11:09:02 2014 -0500

    New upstream release.

 .gitignore           |    1 +
 format-warning.patch |   24 ++++++++++++++++++++++++
 sources              |    2 +-
 xiphos.spec          |    8 +++++++-
 4 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 203ccfa..d63ca5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xiphos-3.1.3.tar.gz
 /xiphos-3.1.5.tar.gz
 /xiphos-3.1.6.tar.gz
 /xiphos-3.2.0.tar.gz
+/xiphos-3.2.1.tar.gz
diff --git a/format-warning.patch b/format-warning.patch
new file mode 100644
index 0000000..5549b68
--- /dev/null
+++ b/format-warning.patch
@@ -0,0 +1,24 @@
+diff --git a/src/gnome2/dialog.c b/src/gnome2/dialog.c
+index d13df3f..ccf161d 100644
+--- a/src/gnome2/dialog.c
++++ b/src/gnome2/dialog.c
+@@ -656,18 +656,13 @@ void gui_generic_warning(char *message)
+ {
+ #if 1
+ 	GtkWidget *dialog;
+-	gchar *dialog_text;
+-
+-	dialog_text = g_strdup_printf
+-	    ("<b><big>Xiphos</big></b>\n\n%s", message);	/* ξίφος */
+ 
+ 	dialog = gtk_message_dialog_new_with_markup
+ 	    (NULL,	/* no need for a parent window */
+ 	     GTK_DIALOG_DESTROY_WITH_PARENT,
+ 	     GTK_MESSAGE_INFO,
+ 	     GTK_BUTTONS_OK,
+-	     dialog_text);
+-	g_free(dialog_text);
++	     "<b><big>Xiphos</big></b>\n\n%s", message);
+ 
+ 	g_signal_connect_swapped (dialog, "response",
+ 				  G_CALLBACK (gtk_widget_destroy),
diff --git a/sources b/sources
index 33424e6..eb86caf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62bafd280a6a5371464d7eabf2ea314e  xiphos-3.2.0.tar.gz
+b420231baa72f0307bd73e687a8add27  xiphos-3.2.1.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index a2cdc6f..70fd9b6 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,5 +1,5 @@
 Name:		xiphos 
-Version:	3.2.0
+Version:	3.2.1
 Release:	1%{?dist}
 Summary:	Bible study and research tool
 
@@ -7,6 +7,7 @@ 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
@@ -34,6 +35,8 @@ Project and elsewhere.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' ./waf configure	\
 	--prefix %{_prefix} --enable-webkit \
@@ -79,6 +82,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Fri Jun 06 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.1-1
+- New upstream release
+
 * Fri May 16 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.0-1
 - New upstream release