diff --git a/.gitignore b/.gitignore index 381b04e..52ed481 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ xiphos-3.1.3.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 diff --git a/glib_version.patch b/glib_version.patch deleted file mode 100644 index 9a89b0d..0000000 --- a/glib_version.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- cmake/config.h.cmake.in-orig 2021-04-15 19:28:57.468140150 +0300 -+++ cmake/config.h.cmake.in 2021-04-15 20:45:57.816551253 +0300 -@@ -65,3 +65,5 @@ - - - #endif -+ -+#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_26) diff --git a/minizip.patch b/minizip.patch deleted file mode 100644 index 8b947cd..0000000 --- a/minizip.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gtk/utilities.c b/src/gtk/utilities.c -index 7dc1a49..708de8d 100644 ---- a/src/gtk/utilities.c -+++ b/src/gtk/utilities.c -@@ -38,7 +38,7 @@ - #include - - #include --#include -+#include - #include - - #include "gui/utilities.h" diff --git a/sources b/sources index 19e5f9c..7341878 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xiphos-4.2.1.tar.xz) = 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe +SHA512 (xiphos-4.4.0.tar.xz) = d5647c90a75897a03ef06219bb2773199bd44b83a79a0be74a378d57f8169c8919a989f43475c71e84e5cb1dfc23029f68ed6d51d7cd5f1837f737ea7e59ff49 diff --git a/xiphos.spec b/xiphos.spec index aa3d54b..a934d17 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,14 +1,14 @@ %undefine __cmake_in_source_build Name: xiphos -Version: 4.2.1 -Release: 20%{?dist} +Version: 4.4.0 +Release: 1%{?dist} Summary: Bible study and research tool -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://xiphos.org/ Source0: https://github.com/crosswire/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz -Patch0: glib_version.patch -Patch1: minizip.patch +BuildRequires: appstream BuildRequires: biblesync-devel >= 2.0.1-3 BuildRequires: cmake BuildRequires: desktop-file-utils @@ -18,16 +18,16 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: gtk3-devel -BuildRequires: gtkhtml3-devel BuildRequires: intltool BuildRequires: itstool BuildRequires: libappstream-glib BuildRequires: libuuid-devel -BuildRequires: minizip-devel +BuildRequires: minizip-ng-compat-devel BuildRequires: rarian-compat +BuildRequires: speech-dispatcher-devel BuildRequires: sword-devel >= 1.8 BuildRequires: util-linux -BuildRequires: webkit2gtk3-devel +BuildRequires: webkit2gtk4.1-devel BuildRequires: yelp-tools BuildRequires: libzip-devel Requires: yelp @@ -48,8 +48,6 @@ Project and elsewhere. %prep %setup -q rm -rf src/biblesync -%patch0 -p0 -%patch1 -p1 %build export CFLAGS="$CFLAGS -fPIC" @@ -62,8 +60,8 @@ export CXXFLAGS export CFLAGS LDFLAGS='%{?__global_ldflags}' \ -%cmake -DGTKHTML:BOOL=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DGTKTVEDITOR=ON \ %{nil} %cmake_build @@ -87,7 +85,7 @@ rm -frv %{buildroot}%{_docdir}/%{name} %license COPYING %{_bindir}/xiphos %{_bindir}/xiphos-nav -%{_datadir}/appdata/xiphos.appdata.xml +%{_datadir}/metainfo/xiphos.appdata.xml %{_datadir}/applications/xiphos.desktop %{_datadir}/icons/hicolor/scalable/apps/xiphos.svg %{_datadir}/xiphos/ @@ -99,6 +97,62 @@ rm -frv %{buildroot}%{_docdir}/%{name} %{_mandir}/man1/%{name}-nav.1.gz %changelog +* Sun Aug 02 2026 Greg Hellings - 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 - 4.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Mon Jun 08 2026 František Zatloukal - 4.3.2-6 +- Rebuilt for icu 78.3 + +* Sat Jan 17 2026 Fedora Release Engineering - 4.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Aug 06 2025 František Zatloukal - 4.3.2-4 +- Rebuilt for icu 77.1 + +* Sat Aug 2 2025 Aaron Rainbolt - 4.3.2-3 +- Switch to webkitgtk4.1 since webkitgtk4.0 has been retired (rhbz#2385989) + +* Fri Jul 25 2025 Fedora Release Engineering - 4.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 02 2025 Aaron Rainbolt - 4.3.2-1 +- New upstream version 4.3.2 + +* Sun Mar 23 2025 Greg Hellings - 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 - 4.2.1-28 +- Strip out editor component to resolve FTBFS + +* Sun Jan 19 2025 Fedora Release Engineering - 4.2.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sun Dec 08 2024 Pete Walter - 4.2.1-26 +- Rebuild for ICU 76 + +* Fri Jul 26 2024 Miroslav Suchý - 4.2.1-25 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 4.2.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Feb 01 2024 Pete Walter - 4.2.1-23 +- Rebuild for ICU 74 + +* Sat Jan 27 2024 Fedora Release Engineering - 4.2.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Lukas Javorsky - 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 - 4.2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild