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
3 changed files with 70 additions and 223 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,8 +17,3 @@ xiphos-3.1.3.tar.gz
 /4.0.5.tar.gz
 /4.0.6.tar.gz
 /4.0.7.tar.gz
-/4.1.0.tar.gz
-/xiphos-4.2.1.tar.xz
-/xiphos-4.3.1.tar.xz
-/xiphos-4.3.2.tar.xz
-/xiphos-4.4.0.tar.xz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xiphos-4.4.0.tar.xz) = d5647c90a75897a03ef06219bb2773199bd44b83a79a0be74a378d57f8169c8919a989f43475c71e84e5cb1dfc23029f68ed6d51d7cd5f1837f737ea7e59ff49
+SHA512 (4.0.7.tar.gz) = 041e0e9c6a7406b02c5b45066b44a3d44c37a34a799c3dfd617b6aa52dc50efbf800e475e107108fcf1d0d23a3522d0a9fa0838c474d2e4dd39f3af9d3429bd4
--- a/xiphos.spec
+++ b/xiphos.spec
@ -1,39 +1,41 @@
-%undefine __cmake_in_source_build
+# 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.4.0
-Release:        1%{?dist}
+Version:        4.0.7
+Release:        2%{?dist}
 Summary:        Bible study and research tool
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            http://xiphos.org/
-Source0:        https://github.com/crosswire/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
-BuildRequires:  appstream
-BuildRequires:  biblesync-devel >= 2.0.1-3
-BuildRequires:  cmake
+Source0:        https://github.com/crosswire/%{name}/archive/%{version}.tar.gz
+BuildRequires:  biblesync-devel >= 1.1.2
 BuildRequires:  desktop-file-utils
 BuildRequires:  dbus-glib-devel
 BuildRequires:  docbook-utils
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
+BuildRequires:  GConf2-devel
 BuildRequires:  gettext
-BuildRequires:  gtk3-devel
+BuildRequires:  gnome-doc-utils
+BuildRequires:  libglade2-devel
 BuildRequires:  intltool
-BuildRequires:  itstool
-BuildRequires:  libappstream-glib
+BuildRequires:  libgsf-devel
 BuildRequires:  libuuid-devel
-BuildRequires:  minizip-ng-compat-devel
 BuildRequires:  rarian-compat
-BuildRequires:  speech-dispatcher-devel
-BuildRequires:  sword-devel >= 1.8
-BuildRequires:  util-linux
-BuildRequires:  webkit2gtk4.1-devel
-BuildRequires:  yelp-tools
-BuildRequires:  libzip-devel
+BuildRequires:  sword-devel >= 1.7.3
+BuildRequires:  gtk3-devel
+BuildRequires:  webkitgtk4-devel
+BuildRequires:  gtkhtml3-devel
 Requires:       yelp
-Obsoletes:      xiphos-gtk2 < 4.1
-Obsoletes:      xiphos-gtk3 < 4.1
-Obsoletes:      xiphos-common < 4.1
+Provides:       xiphos
+Provides:       xiphos-common
+Provides:       xiphos-gtk2
+Provides:       xiphos-gtk3
+Obsoletes:      xiphos-gtk2
+Obsoletes:      xiphos-gtk3
+Obsoletes:      xiphos-common

 %if 0%{?rhel} > 0 && 0%{?rhel} <= 7
 ExcludeArch: ppc64
@ -50,8 +52,8 @@ Project and elsewhere.
 rm -rf src/biblesync

 %build
-export CFLAGS="$CFLAGS -fPIC"
-export CXXFLAGS="$CXXFLAGS -fPIC"
+export CC="gcc -fPIC"
+export CXX="g++ -fPIC"
 %ifarch %{power64}
 CFLAGS="$CFLAGS -D__SANE_USERSPACE_TYPES__"
 CXXFLAGS="$CXXFLAGS -D__SANE_USERSPACE_TYPES__"
@ -59,214 +61,58 @@ export CXXFLAGS="$CXXFLAGS -fPIC"
 export CXXFLAGS
 export CFLAGS

-LDFLAGS='%{?__global_ldflags}' \
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DGTKTVEDITOR=ON \
-    %{nil}
-%cmake_build
+LDFLAGS='%{?__global_ldflags}'      \
+./waf configure                     \
+        --prefix=%{_prefix}         \
+        --enable-webkit2            \
+        --gtk=3 || cat build/config.log
+
+./waf build -v

 %install
-%cmake_install
+./waf install --destdir %{buildroot}

 desktop-file-install --delete-original         \
-    --add-category=X-Bible                     \
-    --add-category=X-Religion                  \
-    --dir=%{buildroot}%{_datadir}/applications \
-    --copy-name-to-generic-name                \
-    %{buildroot}%{_datadir}/applications/xiphos.desktop
+	--add-category=X-Bible                     \
+	--add-category=X-Religion                  \
+	--dir=%{buildroot}%{_datadir}/applications \
+	--copy-name-to-generic-name                \
+	%{buildroot}%{_datadir}/applications/xiphos.desktop

 # package docs with macro
 rm -frv %{buildroot}%{_docdir}/%{name}

 %find_lang %{name}

+# Post-install options
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+# Post-uninstall options
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
-%doc AUTHORS ChangeLog README.md RELEASE-NOTES TODO
+%doc AUTHORS ChangeLog README.md RELEASE-NOTES TODO Xiphos.ogg
 %license COPYING
 %{_bindir}/xiphos
 %{_bindir}/xiphos-nav
-%{_datadir}/metainfo/xiphos.appdata.xml
+%{_datadir}/appdata/xiphos.appdata.xml
 %{_datadir}/applications/xiphos.desktop
+%{_datadir}/gnome/help/xiphos
 %{_datadir}/icons/hicolor/scalable/apps/xiphos.svg
+%{_datadir}/omf/xiphos/
 %{_datadir}/xiphos/
-%{_datadir}/help/C/xiphos
-%{_datadir}/help/fa/xiphos
-%{_datadir}/help/fr/xiphos
-%{_datadir}/help/it/xiphos
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/%{name}-nav.1.gz

 %changelog
-* Sun Aug 02 2026 Greg Hellings <greg.hellings@gmail.com> - 4.4.0-1
- New upstream release 4.4.0
- Introduction of speech services for TTS
- Restoration of editor through GTK-native technologies
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Mon Jun 08 2026 František Zatloukal <fzatlouk@redhat.com> - 4.3.2-6
- Rebuilt for icu 78.3
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Aug 06 2025 František Zatloukal <fzatlouk@redhat.com> - 4.3.2-4
- Rebuilt for icu 77.1
-
-* Sat Aug 2 2025 Aaron Rainbolt <arraybolt3@fedoraproject.org> - 4.3.2-3
- Switch to webkitgtk4.1 since webkitgtk4.0 has been retired (rhbz#2385989)
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jun 02 2025 Aaron Rainbolt <arraybolt3@gmail.com> - 4.3.2-1
- New upstream version 4.3.2
-
-* Sun Mar 23 2025 Greg Hellings <greg.hellings@gmail.com> - 4.3.1-1
- New upstream version 4.3.1 which already has editor fixed
- Updated dependencies
- Removed all patches
-
-* Wed Jan 29 2025 Aaron Rainbolt <arraybolt3@gmail.com> - 4.2.1-28
- Strip out editor component to resolve FTBFS
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Dec 08 2024 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-26
- Rebuild for ICU 76
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 4.2.1-25
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Feb 01 2024 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-23
- Rebuild for ICU 74
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Dec 04 2023 Lukas Javorsky <ljavorsk@redhat.com> - 4.2.1-21
- Rebuilt for minizip-ng transition Fedora change
- Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 4.2.1-19
- Rebuilt for ICU 73.2
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-17
- Rebuild for ICU 72
-
-* Tue Nov 15 2022 Sandro Mani <manisandro@gmail.com> - 4.2.1-16
- Rebuild (minizip-ng)
-
-* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 4.2.1-15
- Rebuilt for ICU 71.1
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Mar 18 2022 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-13
- Add minizip patch to fix FTBFS
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-10
- Rebuild for ICU 69
-
-* Thu Apr 22 2021 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-9
- Added patch for glib version incompatibility
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Dec 14 2020 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-7
- Force rebuild against SWORD 1.9.0
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-6
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jun 11 2020 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-4
- Remove libglade2 from BR
-
-* Sun May 17 2020 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-3
- Rebuild for ICU 67
-
-* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-2
- Rebuild for ICU 67
-
-* Thu May 14 2020 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-1
- Upstream release 4.2.1
- Remove patches
- Remove GConf2 and libgsf dependencies
- Removed Xiphos.ogg doc
- Added Italian help translation
-
-* Thu Apr 02 2020 Greg Hellings <greg.hellings@gmail.com> - 4.1.0-12
- Added fix_nasb.patch
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 4.1.0-10
- Rebuild for ICU 65
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 4.1.0-7
- Rebuild for ICU 63
-
-* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 4.1.0-6
- Rebuild with fixed binutils
-
-* Thu Jul 26 2018 Greg Hellings <greg.hellings@gmail.com> - 4.1.0-5
- Change to CMake build process
- Add several BRs
- Include patch from upstream that adds CMake (TBR 4.1.1 or later)
-
-* Thu Jul 12 2018 Greg Hellings <greg.hellings@gmail.com> - 4.1.0-2
- Rebuild for SWORD 1.8.1-7
-
-* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 4.1.0-3
- Rebuild for ICU 62
-
-* Mon May 14 2018 Greg Hellings <greg.hellings@gmail.com> - 4.1.0-1
- Upstream release 4.1.0
-
-* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 4.0.7-6
- Rebuild for ICU 61.1
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jan 15 2018 Greg Hellings <greg.hellings@gmail.com> - 4.0.7-4
- Rebuild for SWORD 1.8
-
-* Fri Jan 12 2018 Tomas Popela <tpopela@redhat.com> - 4.0.7-3
- Adapt to the webkitgtk4 rename
-
-* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 4.0.7-2
- Rebuild for ICU 60.1
+* 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
@ -305,6 +151,9 @@ rm -frv %{buildroot}%{_docdir}/%{name}
 - 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

@ -321,6 +170,9 @@ rm -frv %{buildroot}%{_docdir}/%{name}
 * 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

@ -467,7 +319,7 @@ rm -frv %{buildroot}%{_docdir}/%{name}
 - 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
@ -557,7 +409,7 @@ rm -frv %{buildroot}%{_docdir}/%{name}
 - 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