Force rebuild to new SWORD

Merge branch 'master' into epel7
Force rebuild against new soname
2018-03-30 10:37:16 -05:00 · 2017-09-25 21:14:42 -05:00 · 2016-03-01 19:59:34 +00:00 · 2016-02-08 19:41:42 +00:00 · 2015-08-13 11:34:17 -05:00 · 2015-04-21 20:04:22 +02:00
2 changed files with 19 additions and 27 deletions
--- a/format-warning.patch
+++ b/format-warning.patch
@ -1,24 +0,0 @@
-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),
--- a/xiphos.spec
+++ b/xiphos.spec
@ -1,6 +1,13 @@
+# Define whether or not we are building for GTK3
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+%define build3 0
+%else
+%define build3 1
+%endif
+
 Name:           xiphos
 Version:        4.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bible study and research tool
 License:        GPLv2+
 URL:            http://xiphos.org/
@ -104,6 +111,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/xiphos/

 %changelog
+* Fri Mar 30 2018 Greg Hellings <greg.hellings@gmail.com> - 4.0.7-2
+- Force rebuild for Sword 1.8.x update
+
 * Mon Sep 25 2017 Greg Hellings <greg.hellings@gmail.com> - 4.0.7-1
 - Upstream release 4.0.7

@ -141,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Moved appdata and desktop files to gtk2 build, allowing
  proper auto-discovery by gnome-software. BZ#1330096

+* Tue Mar 01 2016 Greg Hellings <greg.hellings@gmail.com> - 4.0.4-4
+- Rebuild against new SWORD library
+
 * Mon Feb 08 2016 Greg Hellings <greg.hellings@gmail.com> - 4.0.4-3
 - Exclude ppc64 from EPEL for lack of gtkhtml3

@ -157,6 +170,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

+* Tue Apr 21 2015 Matej Cepl <mcepl@redhat.com> - 4.0.2-2
+- Don’t build on ppc* on EPEL-7 ... we don't have gtkhtml3 there.
+
 * Wed Apr 15 2015 Greg Hellings <greg.hellings@gmail.com> 4.0.2-1
 - Version bump - major upstream memory bugs

@ -303,7 +319,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Update to 2.3.6

 * Thu Jul 24 2008 Deji Akingunola <dakingun@gmail.com> - 2.3.5-2
- Bump EVR 
+- Bump EVR

 * Thu Jul 03 2008 Deji Akingunola <dakingun@gmail.com> - 2.3.5-1
 - Update to 2.3.5
@ -393,7 +409,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Fix Build requires

 * Wed Nov 08 2006 Deji Akingunola <dakingun@gmail.com> - 2.1.8-1
- Update to new (unstable) version 
+- Update to new (unstable) version

 * Wed Sep 20 2006 Deji Akingunola <dakingun@gmail.com> - 2.1.6-4
 - Add perl(XML::Parser) to the BRs
Author	SHA1	Message	Date
Gregory Hellings	5e03e879c5	Force rebuild to new SWORD	2018-03-30 10:37:16 -05:00
Gregory Hellings	1765202fdf	Merge branch 'master' into epel7	2017-09-25 21:14:42 -05:00
Greg Hellings	6539c0550f	Force rebuild against new soname	2016-03-01 19:59:34 +00:00
Greg Hellings	97abce9436	Merge branch 'master' into epel7	2016-02-08 19:41:42 +00:00
Greg Hellings	22d5c54d7c	Merge branch 'master' into epel7	2015-08-13 11:34:17 -05:00
Matěj Cepl	2133022fbd	Don’t build on ppc* on EPEL-7 ... we don't have gtkhtml3 there.	2015-04-21 20:04:22 +02:00
Matěj Cepl	6eed20c2d0	Merge branch 'master' into epel7 Conflicts: .gitignore sources xiphos.spec	2015-04-19 21:07:41 +02:00
Karsten Hopp	a8027bc35e	add changelog: fix ppc64* builds	2015-04-19 20:47:46 +02:00
Karsten Hopp	d204529f80	fix ppc64* builds	2015-04-19 20:47:27 +02:00
Greg Hellings	3c36fe41be	New upstream version 3.2.2	2015-04-19 20:47:27 +02:00
Peter Robinson	b7e48ca320	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2015-04-19 20:46:45 +02:00
Gregory Hellings	7492eb98e8	Disable ppc64 build due to upstream failures	2015-01-26 15:22:53 -06:00
Greg Hellings	6a4c21112b	Removed upstreamed patch	2014-12-02 00:12:00 -06:00
Greg Hellings	a7cdaa9d66	New source tarball	2014-12-01 23:58:31 -06:00
Greg Hellings	9738d6a9bd	New upstream and EPEL7 version	2014-12-01 23:44:34 -06:00
Christopher Meng	3b76cf2116	Merge branch 'master' into epel7	2014-08-05 17:27:44 +08:00
Christopher Meng	2ce8a2e485	Merge branch 'master' into epel7 Conflicts: xiphos.spec	2014-08-05 17:24:14 +08:00
Matěj Cepl	f7b1213c9b	Merge branch 'master' into epel7 Conflicts: xiphos.spec	2014-06-08 09:33:24 +02:00
Matěj Cepl	88d7e7220a	Upgrade to 3.2.1	2014-06-08 09:24:52 +02:00
Greg Hellings	e02451a346	Reduced GTK to GTK2 because of known bugs. Upstream reports several known bugs with GTK3 and certain Linux environments. Reducing the GTK dependency to 2 for now is a workaround while upstream fixes these issues for the next release.	2014-01-29 21:58:10 -06:00