[bibletime] New 2.10.0 release, removed non-applying patches.
Greg Hellings
greghellings at fedoraproject.org
Wed Jan 29 20:22:13 UTC 2014
commit 270607f9c5d3708bdb4bfefea1a774228587277e
Author: Greg Hellings <greg.hellings at gmail.com>
Date: Wed Jan 29 14:22:20 2014 -0600
New 2.10.0 release, removed non-applying patches.
.gitignore | 1 +
0091-Fix-moveToAnchor-for-Qt5.patch | 28 ----------------------------
bibletime-2.9.1-dt_validate.patch | 10 ----------
bibletime-2.9.1-reduce_linking.patch | 16 ----------------
bibletime.spec | 28 +++++++---------------------
sources | 2 +-
6 files changed, 9 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 90469f3..7ef322f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ bibletime-2.7.tar.gz
/bibletime-2.8.0.tar.bz2
/bibletime-2.8.2.tar.bz2
/bibletime-2.9.1.tar.bz2
+/bibletime-2.10.0.tar.xz
diff --git a/bibletime.spec b/bibletime.spec
index 982eacb..914b266 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -1,33 +1,21 @@
Summary: An easy to use Bible study tool
Name: bibletime
-Version: 2.9.1
-Release: 8%{?dist}
+Version: 2.10.0
+Release: 1%{?dist}
License: GPLv2
Url: http://www.bibletime.info/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: pkgconfig(QtGui) >= 4.5.0
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtXml)
BuildRequires: pkgconfig(QtWebKit)
-BuildRequires: sword-devel >= 1.5.10 clucene-core-devel >= 2.0
+BuildRequires: sword-devel >= 1.7.0 clucene-core-devel >= 2.0
BuildRequires: boost-devel openssl-devel dbus-devel
BuildRequires: desktop-file-utils gettext
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
-## upstreamable patches
-# fix bibletime.desktop to pass validation
-Patch50: bibletime-2.9.1-dt_validate.patch
-# reduce linking to sword-related deps (curl, icu, zlib) which are not
-# needed on fedora. May be upstreamable when/if we make FindSword.cmake
-# smarter (with at least some pkgconfig hints)
-Patch51: bibletime-2.9.1-reduce_linking.patch
-
-## upstream patches
-# fixes display problems using qtwebkit-2.3+
-Patch0091: 0091-Fix-moveToAnchor-for-Qt5.patch
-
%description
BibleTime is a free and easy to use cross-platform bible study tool.
@@ -39,11 +27,6 @@ BibleTime is a frontend for the SWORD Bible Framework.
%prep
%setup -q
-%patch50 -p1 -b .dt_validate
-%patch51 -p1 -b .reduce_linking
-%patch0091 -p1 -b .0091
-
-
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
@@ -91,6 +74,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop
%doc ChangeLog README LICENSE
%changelog
+* Wed Jan 29 2014 Greg Hellings <greg.hellings at gmail.com> - 2.10.0-1
+- Updated to bibletime-2.10.0
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 9486ddd..3056cc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff89f440418f3e23c0bf039810f21479 bibletime-2.9.1.tar.bz2
+56c31c506a004e262187d42ffab67e1a bibletime-2.10.0.tar.xz
More information about the scm-commits
mailing list