[bibletime] Update to 2.8.2
Deji Akingunola
deji at fedoraproject.org
Thu Oct 20 05:32:02 UTC 2011
commit 083c8c1e254b50a3462d0c2cb61756fba7e4e6b5
Author: Deji Akingunola <dakingun at mail.com>
Date: Thu Oct 20 01:35:05 2011 -0400
Update to 2.8.2
.gitignore | 1 +
bibletime-clucene2.patch | 30 ++++++++++++++----------------
bibletime.spec | 7 +++++--
sources | 2 +-
4 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9f76cb..3172f88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
bibletime-2.7.tar.gz
/bibletime-2.7.3.tar.bz2
/bibletime-2.8.0.tar.bz2
+/bibletime-2.8.2.tar.bz2
diff --git a/bibletime-clucene2.patch b/bibletime-clucene2.patch
index deabab0..c88b9eb 100644
--- a/bibletime-clucene2.patch
+++ b/bibletime-clucene2.patch
@@ -1,6 +1,5 @@
-diff -urb bibletime-2.8.1/cmake/FindCLucene.cmake bibletime-2.8.1b/cmake/FindCLucene.cmake
---- bibletime-2.8.1/cmake/FindCLucene.cmake 2011-01-22 04:11:11.000000000 -0800
-+++ bibletime-2.8.1b/cmake/FindCLucene.cmake 2011-10-18 09:34:33.018912674 -0700
+--- cmake/FindCLucene.cmake 2011-08-27 14:37:29.000000000 -0400
++++ cmake/FindCLucene.cmake.new 2011-10-20 00:11:40.777189102 -0400
@@ -95,6 +95,18 @@
MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
SET(CLUCENE_GOOD_VERSION FALSE)
@@ -20,9 +19,8 @@ diff -urb bibletime-2.8.1/cmake/FindCLucene.cmake bibletime-2.8.1b/cmake/FindCLu
ENDIF (CLMATCH)
ELSE (CLUCENE_LIBRARY_DIR)
MESSAGE(STATUS "CLucene library dir not found.")
-diff -urb bibletime-2.8.1/CMakeLists.txt bibletime-2.8.1b/CMakeLists.txt
---- bibletime-2.8.1/CMakeLists.txt 2011-01-22 04:11:11.000000000 -0800
-+++ bibletime-2.8.1b/CMakeLists.txt 2011-10-18 09:33:32.684505476 -0700
+--- CMakeLists.txt 2011-08-27 14:37:29.000000000 -0400
++++ CMakeLists.txt.new 2011-10-20 00:14:03.885400003 -0400
@@ -147,6 +147,7 @@
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
${QT_LIBRARIES}
@@ -39,9 +37,8 @@ diff -urb bibletime-2.8.1/CMakeLists.txt bibletime-2.8.1b/CMakeLists.txt
${CURL_LIBRARIES} # optional, empty if not found
${ICU_LIBRARIES} # optional, empty if not found
${ICU_I18N_LIBRARIES} # optional, empty if not found
-diff -urb bibletime-2.8.1/src/backend/drivers/cswordmoduleinfo.cpp bibletime-2.8.1b/src/backend/drivers/cswordmoduleinfo.cpp
---- bibletime-2.8.1/src/backend/drivers/cswordmoduleinfo.cpp 2011-01-22 04:11:11.000000000 -0800
-+++ bibletime-2.8.1b/src/backend/drivers/cswordmoduleinfo.cpp 2011-10-18 09:22:24.541080927 -0700
+--- src/backend/drivers/cswordmoduleinfo.cpp 2011-08-27 14:37:29.000000000 -0400
++++ src/backend/drivers/cswordmoduleinfo.cpp.new 2011-10-20 00:45:12.549038492 -0400
@@ -11,8 +11,6 @@
#include <QSharedPointer>
@@ -59,7 +56,7 @@ diff -urb bibletime-2.8.1/src/backend/drivers/cswordmoduleinfo.cpp bibletime-2.8
m_module->setPosition(sword::TOP);
unsigned long verseLowIndex = m_module->Index();
-@@ -455,7 +452,7 @@
+@@ -458,7 +455,7 @@
lucene_utf8towcs(wcharBuffer, searchedText.toUtf8().constData(), BT_MAX_LUCENE_FIELD_LENGTH);
QSharedPointer<lucene::search::Query> q( lucene::queryParser::QueryParser::parse((const TCHAR*)wcharBuffer, (const TCHAR*)_T("content"), &analyzer) );
@@ -68,7 +65,7 @@ diff -urb bibletime-2.8.1/src/backend/drivers/cswordmoduleinfo.cpp bibletime-2.8
/// \warning This is a workaround for Sword constness
const bool useScope = (const_cast<sword::ListKey&>(scope).Count() > 0);
-@@ -465,7 +462,7 @@
+@@ -468,7 +465,7 @@
QSharedPointer<sword::SWKey> swKey( module()->CreateKey() );
@@ -77,16 +74,17 @@ diff -urb bibletime-2.8.1/src/backend/drivers/cswordmoduleinfo.cpp bibletime-2.8
doc = &h->doc(i);
lucene_wcstoutf8(utfBuffer, (const wchar_t*)doc->get((const TCHAR*)_T("key")), BT_MAX_LUCENE_FIELD_LENGTH);
-diff -urb bibletime-2.8.1/src/backend/drivers/cswordmoduleinfo.h bibletime-2.8.1b/src/backend/drivers/cswordmoduleinfo.h
---- bibletime-2.8.1/src/backend/drivers/cswordmoduleinfo.h 2011-01-22 04:11:11.000000000 -0800
-+++ bibletime-2.8.1b/src/backend/drivers/cswordmoduleinfo.h 2011-10-18 09:19:58.790491225 -0700
-@@ -23,6 +23,9 @@
+--- src/backend/drivers/cswordmoduleinfo.h 2011-08-27 14:37:29.000000000 -0400
++++ src/backend/drivers/cswordmoduleinfo.h.new 2011-10-20 00:56:58.794209212 -0400
+@@ -23,7 +23,10 @@
#include <swsearchable.h>
#include <swversion.h>
+-
+// CLucene no longer lists the following functions in its headers
+extern size_t lucene_utf8towcs(wchar_t *, const char *, size_t maxslen);
+extern size_t lucene_wcstoutf8 (char *, const wchar_t *, size_t maxslen);
-
++
class CSwordBackend;
class CSwordKey;
+
diff --git a/bibletime.spec b/bibletime.spec
index acaaabe..8fec21b 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -1,7 +1,7 @@
Summary: An easy to use Bible study tool
Name: bibletime
-Version: 2.8.1
-Release: 2%{?dist}
+Version: 2.8.2
+Release: 1%{?dist}
License: GPLv2
Url: http://www.bibletime.info/
Group: Applications/Productivity
@@ -83,6 +83,9 @@ done
%doc ChangeLog README LICENSE
%changelog
+* Thu Oct 20 2011 Deji Akingunola <dakingun at gmail.com> - 2.8.2-1
+- Update to 2.8.2
+
* Mon Oct 17 2011 Jonathan Dieter <jdieter at lesbg.com> - 2.8.1-2
- Add patch so it builds again CLucene 2.0+
diff --git a/sources b/sources
index efa0f90..e0ede0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2037e6995ffb7ecdc153a8d2d55de46f bibletime-2.8.1.tar.bz2
+2e17bf35f1e79b5fcd193d9e620d4961 bibletime-2.8.2.tar.bz2
More information about the scm-commits
mailing list