From e02451a34663a18d5ec4de7366762ce70229be82 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 29 Jan 2014 21:54:49 -0600 Subject: [PATCH 01/13] 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. --- xiphos.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index 9d2e290..4965ac6 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 3.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bible study and research tool Group: Applications/Text @@ -12,12 +12,14 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gnome-doc-utils BuildRequires: gtkhtml3-devel GConf2-devel -BuildRequires: webkitgtk3-devel +BuildRequires: webkitgtk-devel BuildRequires: libgsf-devel BuildRequires: dbus-glib-devel #BuildRequires: ImageMagick-c++-devel BuildRequires: perl(XML::Parser) intltool BuildRequires: rarian-compat +# Needed on GTK+2 builds +BuildRequires: libglade2-devel Requires: yelp Obsoletes: gnomesword < 2.4.2 Provides: gnomesword = %{version}-%{release} @@ -33,7 +35,8 @@ Project and elsewhere. %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 + --prefix %{_prefix} --enable-webkit \ + --gtk=2 ./waf build -v @@ -76,6 +79,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %_datadir/gnome/help/xiphos %changelog +* Wed Jan 29 2014 Greg Hellings - 3.1.6-2 +- Removed GTK3 in favor of GTK2, as GTK3 is known to be buggy for this release + * Wed Jan 29 2014 Deji Akingunola - 3.1.6-1 - Update to version 3.1.6 From 88d7e7220a492814b2ffa77e4d1319700f1421b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Sun, 8 Jun 2014 09:24:52 +0200 Subject: [PATCH 02/13] Upgrade to 3.2.1 --- .gitignore | 1 + sources | 2 +- xiphos.spec | 2 +- 3 files changed, 3 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/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..eba770a 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 From 9738d6a9bd5fc3a104b03a5eda9ec4ab4c2875f0 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 1 Dec 2014 23:44:34 -0600 Subject: [PATCH 03/13] New upstream and EPEL7 version --- xiphos.spec | 24 +++++++----------------- 1 file 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 - 3.2.2-1 +- New upstream release and branch for EPEL7 + * Sat Aug 02 2014 Christopher Meng - 3.2.1-2 - Build against GTK+3 From a7cdaa9d6678e8f0aebf08cd8e7bfbf2d870e312 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 1 Dec 2014 23:58:31 -0600 Subject: [PATCH 04/13] New source tarball --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 From 6a4c21112bfe26f8eef0b674c00afb31762b2987 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 2 Dec 2014 00:12:00 -0600 Subject: [PATCH 05/13] Removed upstreamed patch --- format-warning.patch | 24 ------------------------ xiphos.spec | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 format-warning.patch diff --git a/format-warning.patch b/format-warning.patch deleted file mode 100644 index 5549b68..0000000 --- a/format-warning.patch +++ /dev/null @@ -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 -- ("Xiphos\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); -+ "Xiphos\n\n%s", message); - - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), diff --git a/xiphos.spec b/xiphos.spec index 6ff8d1e..c5bd821 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -5,7 +5,6 @@ Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ Source0: http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz -Patch0: format-warning.patch BuildRequires: biblesync-devel BuildRequires: desktop-file-utils BuildRequires: dbus-glib-devel @@ -32,7 +31,6 @@ Project and elsewhere. %prep %setup -q -%patch0 -p1 %build CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \ From 7492eb98e85d6936035def3c1041cc167ee5496a Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 26 Jan 2015 15:22:53 -0600 Subject: [PATCH 06/13] Disable ppc64 build due to upstream failures --- xiphos.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xiphos.spec b/xiphos.spec index c5bd821..8293b33 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -22,6 +22,7 @@ BuildRequires: webkitgtk3-devel Requires: yelp Obsoletes: gnomesword < 2.4.2-1 Provides: gnomesword = %{version}-%{release} +ExcludeArch: ppc64 %description Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux, From b7e48ca320f4c12579013d22f91b232fed9a31ca Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:07:28 +0000 Subject: [PATCH 07/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xiphos.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xiphos.spec b/xiphos.spec index 8293b33..beaa593 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -86,6 +86,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon Dec 01 2014 Greg Hellings - 3.2.2-1 - New upstream release and branch for EPEL7 +* Mon Aug 18 2014 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Aug 02 2014 Christopher Meng - 3.2.1-2 - Build against GTK+3 From 3c36fe41be8099cdc1bfaaa3c0280ef445dedd0e Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 25 Aug 2014 22:08:24 -0500 Subject: [PATCH 08/13] New upstream version 3.2.2 --- xiphos.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xiphos.spec b/xiphos.spec index beaa593..ef1e972 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -32,6 +32,7 @@ Project and elsewhere. %prep %setup -q +rm -rf src/biblesync %build CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \ @@ -86,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon Dec 01 2014 Greg Hellings - 3.2.2-1 - New upstream release and branch for EPEL7 +* Mon Aug 25 2014 Greg Hellings - 3.2.2-1 +- New upstream version + * Mon Aug 18 2014 Fedora Release Engineering - 3.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From d204529f8036c4d5f1e6ba402a48979967e12144 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 16 Oct 2014 11:21:28 +0200 Subject: [PATCH 09/13] fix ppc64* builds --- xiphos.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index ef1e972..53c673f 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 3.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -35,8 +35,15 @@ Project and elsewhere. rm -rf src/biblesync %build -CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \ -CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \ +CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' +CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' +%ifarch %{power64} + CFLAGS="$CFLAGS -D__SANE_USERSPACE_TYPES__" + CXXFLAGS="$CXXFLAGS -D__SANE_USERSPACE_TYPES__" +%endif +export CXXFLAGS +export CFLAGS + LDFLAGS='%{?__global_ldflags}' \ ./waf configure \ --prefix=%{_prefix} \ From a8027bc35eb49d7cfc23eadb8f401757450562bd Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 16 Oct 2014 14:37:32 +0200 Subject: [PATCH 10/13] add changelog: fix ppc64* builds --- xiphos.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index 53c673f..25e5de1 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -91,8 +91,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog -* Mon Dec 01 2014 Greg Hellings - 3.2.2-1 -- New upstream release and branch for EPEL7 +* Thu Oct 16 2014 Karsten Hopp 3.2.2-2 +- fix ppc64* builds * Mon Aug 25 2014 Greg Hellings - 3.2.2-1 - New upstream version From 2133022fbd032448c62470d0943a6214fc49c9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 21 Apr 2015 20:04:22 +0200 Subject: [PATCH 11/13] =?UTF-8?q?Don=E2=80=99t=20build=20on=20ppc*=20on=20?= =?UTF-8?q?EPEL-7=20...=20we=20don't=20have=20gtkhtml3=20there.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiphos.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index f8c26b7..c17f55e 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -5,9 +5,9 @@ %define build3 1 %endif -Name: xiphos +Name: xiphos Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -33,6 +33,9 @@ BuildRequires: gtk3-devel BuildRequires: webkitgtk3-devel %endif Requires: yelp +%if 0%{?rhel} > 0 && 0%{?rhel} <= 7 +ExcludeArch: ppc64 +%endif %description Xiphos is a Bible study tool written for Linux, @@ -203,6 +206,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/appdata/xiphos.appdata.xml %changelog +* Tue Apr 21 2015 Matej Cepl - 4.0.2-2 +- Don’t build on ppc* on EPEL-7 ... we don't have gtkhtml3 there. + * Wed Apr 15 2015 Greg Hellings 4.0.2-1 - Version bump - major upstream memory bugs @@ -349,7 +355,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Update to 2.3.6 * Thu Jul 24 2008 Deji Akingunola - 2.3.5-2 -- Bump EVR +- Bump EVR * Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 - Update to 2.3.5 @@ -439,7 +445,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Fix Build requires * Wed Nov 08 2006 Deji Akingunola - 2.1.8-1 -- Update to new (unstable) version +- Update to new (unstable) version * Wed Sep 20 2006 Deji Akingunola - 2.1.6-4 - Add perl(XML::Parser) to the BRs From 6539c0550f89a496d91883aed32f812276c54fae Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 1 Mar 2016 19:59:34 +0000 Subject: [PATCH 12/13] Force rebuild against new soname --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index de2c980..d71cde5 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -7,7 +7,7 @@ Name: xiphos Version: 4.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -210,6 +210,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/appdata/xiphos.appdata.xml %changelog +* Tue Mar 01 2016 Greg Hellings - 4.0.4-4 +- Rebuild against new SWORD library + * Mon Feb 08 2016 Greg Hellings - 4.0.4-3 - Exclude ppc64 from EPEL for lack of gtkhtml3 From 5e03e879c540e53274773d057803379a155d6bc2 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 30 Mar 2018 10:37:16 -0500 Subject: [PATCH 13/13] Force rebuild to new SWORD --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index 3ddfe44..c4f4424 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -7,7 +7,7 @@ Name: xiphos Version: 4.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -111,6 +111,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Fri Mar 30 2018 Greg Hellings - 4.0.7-2 +- Force rebuild for Sword 1.8.x update + * Mon Sep 25 2017 Greg Hellings - 4.0.7-1 - Upstream release 4.0.7