Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f9ae0cf29f |
5 changed files with 10 additions and 29 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -19,3 +19,4 @@ xiphos-3.1.3.tar.gz
|
||||||
/4.0.7.tar.gz
|
/4.0.7.tar.gz
|
||||||
/4.1.0.tar.gz
|
/4.1.0.tar.gz
|
||||||
/xiphos-4.2.1.tar.xz
|
/xiphos-4.2.1.tar.xz
|
||||||
|
/xiphos-4.3.1.tar.xz
|
||||||
|
|
|
||||||
|
|
@ -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)
|
|
||||||
|
|
@ -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 <gdk-pixbuf/gdk-pixbuf.h>
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
-#include <zip.h>
|
|
||||||
+#include <minizip/zip.h>
|
|
||||||
#include <zlib.h>
|
|
||||||
|
|
||||||
#include "gui/utilities.h"
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (xiphos-4.2.1.tar.xz) = 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
|
SHA512 (xiphos-4.3.1.tar.xz) = 842f63acb40ae00b47757029bd69de23652501e6f1736d9420f5a6fe3be6a9cf3c41023ccbc539d3262a310363c024dce8055d35dec0951e8f81b2c0b4cf99eb
|
||||||
|
|
|
||||||
15
xiphos.spec
15
xiphos.spec
|
|
@ -1,15 +1,13 @@
|
||||||
%undefine __cmake_in_source_build
|
%undefine __cmake_in_source_build
|
||||||
|
|
||||||
Name: xiphos
|
Name: xiphos
|
||||||
Version: 4.2.1
|
Version: 4.3.1
|
||||||
Release: 25%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Bible study and research tool
|
Summary: Bible study and research tool
|
||||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
URL: http://xiphos.org/
|
URL: http://xiphos.org/
|
||||||
Source0: https://github.com/crosswire/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
Source0: https://github.com/crosswire/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||||
Patch0: glib_version.patch
|
|
||||||
Patch1: minizip.patch
|
|
||||||
BuildRequires: biblesync-devel >= 2.0.1-3
|
BuildRequires: biblesync-devel >= 2.0.1-3
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
|
|
@ -49,8 +47,6 @@ Project and elsewhere.
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
rm -rf src/biblesync
|
rm -rf src/biblesync
|
||||||
%patch -P0 -p0
|
|
||||||
%patch -P1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$CFLAGS -fPIC"
|
export CFLAGS="$CFLAGS -fPIC"
|
||||||
|
|
@ -88,7 +84,7 @@ rm -frv %{buildroot}%{_docdir}/%{name}
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_bindir}/xiphos
|
%{_bindir}/xiphos
|
||||||
%{_bindir}/xiphos-nav
|
%{_bindir}/xiphos-nav
|
||||||
%{_datadir}/appdata/xiphos.appdata.xml
|
%{_datadir}/metainfo/xiphos.appdata.xml
|
||||||
%{_datadir}/applications/xiphos.desktop
|
%{_datadir}/applications/xiphos.desktop
|
||||||
%{_datadir}/icons/hicolor/scalable/apps/xiphos.svg
|
%{_datadir}/icons/hicolor/scalable/apps/xiphos.svg
|
||||||
%{_datadir}/xiphos/
|
%{_datadir}/xiphos/
|
||||||
|
|
@ -100,6 +96,11 @@ rm -frv %{buildroot}%{_docdir}/%{name}
|
||||||
%{_mandir}/man1/%{name}-nav.1.gz
|
%{_mandir}/man1/%{name}-nav.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
||||||
|
|
||||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 4.2.1-25
|
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 4.2.1-25
|
||||||
- convert license to SPDX
|
- convert license to SPDX
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue