clucene was removed due to minimization efforts prior to public launch
This commit is contained in:
parent
4db2fb601c
commit
938fca58f8
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,3 +0,0 @@
|
|||||||
clucene-core-0.9.21b.tar.bz2
|
|
||||||
/clucene-core-2.3.3.4.tar.gz
|
|
||||||
/clucene-core-2.3.3.4-e8e3d20.tar.xz
|
|
@ -1,49 +0,0 @@
|
|||||||
From c1c2000c35ff39b09cb70fbdf66a107d3b17a674 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Wed, 12 Oct 2022 08:40:49 +0200
|
|
||||||
Subject: [PATCH] Fix missing #include <time.h>
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
At least on recent Fedora 37 beta, building now failed with
|
|
||||||
|
|
||||||
> CLucene/document/DateTools.cpp:26:19: error: ‘gmtime’ was not declared in this scope
|
|
||||||
> 26 | tm *ptm = gmtime(&secs);
|
|
||||||
> | ^~~~~~
|
|
||||||
|
|
||||||
etc.
|
|
||||||
|
|
||||||
As it turns out, after 22f9d40320e3deeaa8d6aaa7a770077c20a21dae "git-svn-id:
|
|
||||||
https://clucene.svn.sourceforge.net/svnroot/clucene/branches/lucene2_3_2@2672
|
|
||||||
20ef185c-fe11-0410-a618-ba9304b01011" on 2008-06-26 had commented out
|
|
||||||
_CL_TIME_WITH_SYS_TIME in clucene-config.h.cmake as "not actually used for
|
|
||||||
anything", then cceccfb52917b5f4da447f1cf20c135952d41442 "Presenting DateTools
|
|
||||||
and deprecating DateField. DateTools still requires some testing and its own
|
|
||||||
unit testing" on 2008-06-29 had introduced this use of it (into then
|
|
||||||
src/CLucene/document/DateTools.H). And apparently most build environments have
|
|
||||||
silently been happy ever since when the dead leading check for
|
|
||||||
_CL_TIME_WITH_SYS_TIME didn't include both <sys/time.h> and <time.h>, but the
|
|
||||||
following check for _CL_HAVE_SYS_TIME_H only included <sys/time.h> but not
|
|
||||||
<time.h>.
|
|
||||||
---
|
|
||||||
src/shared/CLucene/clucene-config.h.cmake | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/shared/CLucene/clucene-config.h.cmake b/src/shared/CLucene/clucene-config.h.cmake
|
|
||||||
index bd8683a5..6fe0f92b 100644
|
|
||||||
--- a/src/shared/CLucene/clucene-config.h.cmake
|
|
||||||
+++ b/src/shared/CLucene/clucene-config.h.cmake
|
|
||||||
@@ -100,8 +100,7 @@ ${SYMBOL__T}
|
|
||||||
//#cmakedefine _CL_STAT_MACROS_BROKEN
|
|
||||||
|
|
||||||
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
|
|
||||||
-//not actually used for anything...
|
|
||||||
-//#cmakedefine _CL_TIME_WITH_SYS_TIME 1
|
|
||||||
+#cmakedefine _CL_TIME_WITH_SYS_TIME 1
|
|
||||||
|
|
||||||
/* Define that we will be using -fvisibility=hidden, and
|
|
||||||
* make public classes visible using __attribute__ ((visibility("default")))
|
|
||||||
--
|
|
||||||
2.37.3
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
|||||||
From 44cc1d696b6528712d92d33660dd8017dcd0b3e2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Wed, 31 Jul 2019 16:57:31 +0200
|
|
||||||
Subject: [PATCH 1/2] Make sure to return value from non-void function
|
|
||||||
|
|
||||||
This had been commented out with 92145f058c88a9607341d8a20c3944a96ec00cf8
|
|
||||||
"All remaining memory leaks int tests removed. Fixes made by Veit and Anthony
|
|
||||||
Novatsis are incorporated" for no apparent reason---presumably by accident.
|
|
||||||
|
|
||||||
The effect (besides a -Wreturn-type warning) when building e.g. RelWithDebInfo
|
|
||||||
(i.e., with optimizations) on Fedora 30 (with GCC 9.1) was that the implicit
|
|
||||||
call to ~WhitespaceAnalyzer at the end of searchDocs was directly followed
|
|
||||||
(lacking the code sequence corresponding to "return 0;") by some compiler-
|
|
||||||
generated code to jump into some _Z10searchDocsPv.cold code (which is apparently
|
|
||||||
meant as an optimization, to be called from certain cold conditions) which
|
|
||||||
happened to also call ~WhitespaceAnalyzer. The net effect was that the
|
|
||||||
|
|
||||||
WhitespaceAnalyzer an;
|
|
||||||
|
|
||||||
object was deleted twice, causing a SIGSEGV.
|
|
||||||
---
|
|
||||||
src/test/search/TestIndexSearcher.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/test/search/TestIndexSearcher.cpp b/src/test/search/TestIndexSearcher.cpp
|
|
||||||
index 5c410ff4..02c21aaf 100644
|
|
||||||
--- a/src/test/search/TestIndexSearcher.cpp
|
|
||||||
+++ b/src/test/search/TestIndexSearcher.cpp
|
|
||||||
@@ -28,7 +28,7 @@ _LUCENE_THREAD_FUNC(searchDocs, _searcher) {
|
|
||||||
_CLLDELETE(query);
|
|
||||||
|
|
||||||
CONDITION_WAIT(deleteMutex, deleteCondition);
|
|
||||||
-// _LUCENE_THREAD_FUNC_RETURN(0);
|
|
||||||
+ _LUCENE_THREAD_FUNC_RETURN(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void testEndThreadException(CuTest *tc) {
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
@ -1,112 +0,0 @@
|
|||||||
From bdc374bfbb0ca34ddb40713eb51d8535fdf11952 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Wed, 31 Jul 2019 16:27:33 +0200
|
|
||||||
Subject: [PATCH 2/2] Avoid deadlock in TestIndexSearcher
|
|
||||||
|
|
||||||
---
|
|
||||||
src/test/search/TestIndexSearcher.cpp | 51 +++++++++++++++++++++------
|
|
||||||
1 file changed, 41 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/test/search/TestIndexSearcher.cpp b/src/test/search/TestIndexSearcher.cpp
|
|
||||||
index 02c21aaf..a6dde5ba 100644
|
|
||||||
--- a/src/test/search/TestIndexSearcher.cpp
|
|
||||||
+++ b/src/test/search/TestIndexSearcher.cpp
|
|
||||||
@@ -8,9 +8,11 @@
|
|
||||||
|
|
||||||
DEFINE_MUTEX(searchMutex);
|
|
||||||
DEFINE_CONDITION(searchCondition);
|
|
||||||
+bool searchReady;
|
|
||||||
|
|
||||||
DEFINE_MUTEX(deleteMutex);
|
|
||||||
DEFINE_CONDITION(deleteCondition);
|
|
||||||
+bool deleteReady;
|
|
||||||
|
|
||||||
_LUCENE_THREAD_FUNC(searchDocs, _searcher) {
|
|
||||||
|
|
||||||
@@ -19,15 +21,20 @@ _LUCENE_THREAD_FUNC(searchDocs, _searcher) {
|
|
||||||
Query * query = QueryParser::parse(_T("one"), _T("content"), &an);
|
|
||||||
Hits * hits = searcher->search(query);
|
|
||||||
|
|
||||||
-// _LUCENE_SLEEP(9999); //make sure that searchMutex is being waited on...
|
|
||||||
+ {
|
|
||||||
+ SCOPED_LOCK_MUTEX(searchMutex);
|
|
||||||
+ searchReady = true;
|
|
||||||
+ CONDITION_NOTIFYALL(searchCondition);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- CONDITION_NOTIFYALL(searchCondition);
|
|
||||||
SCOPED_LOCK_MUTEX(deleteMutex);
|
|
||||||
|
|
||||||
_CLLDELETE(hits);
|
|
||||||
_CLLDELETE(query);
|
|
||||||
|
|
||||||
- CONDITION_WAIT(deleteMutex, deleteCondition);
|
|
||||||
+ while (!deleteReady) {
|
|
||||||
+ CONDITION_WAIT(deleteMutex, deleteCondition);
|
|
||||||
+ }
|
|
||||||
_LUCENE_THREAD_FUNC_RETURN(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -55,13 +62,24 @@ void testEndThreadException(CuTest *tc) {
|
|
||||||
|
|
||||||
// this sequence is OK: delete searcher after search thread finish
|
|
||||||
{
|
|
||||||
+ searchReady = false;
|
|
||||||
+ deleteReady = false;
|
|
||||||
+
|
|
||||||
IndexSearcher * searcher = _CLNEW IndexSearcher(&ram);
|
|
||||||
_LUCENE_THREADID_TYPE thread = _LUCENE_THREAD_CREATE(&searchDocs, searcher);
|
|
||||||
- SCOPED_LOCK_MUTEX(searchMutex);
|
|
||||||
|
|
||||||
- CONDITION_WAIT(searchMutex, searchCondition);
|
|
||||||
-// _LUCENE_SLEEP(9999); //make sure that deleteMutex is being waited on...
|
|
||||||
- CONDITION_NOTIFYALL(deleteCondition);
|
|
||||||
+ {
|
|
||||||
+ SCOPED_LOCK_MUTEX(searchMutex);
|
|
||||||
+ while (!searchReady) {
|
|
||||||
+ CONDITION_WAIT(searchMutex, searchCondition);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ {
|
|
||||||
+ SCOPED_LOCK_MUTEX(deleteMutex);
|
|
||||||
+ deleteReady = true;
|
|
||||||
+ CONDITION_NOTIFYALL(deleteCondition);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
_LUCENE_THREAD_JOIN(thread);
|
|
||||||
|
|
||||||
@@ -71,14 +89,27 @@ void testEndThreadException(CuTest *tc) {
|
|
||||||
|
|
||||||
// this produces memory exception: delete searcher after search finish but before thread finish
|
|
||||||
{
|
|
||||||
+ searchReady = false;
|
|
||||||
+ deleteReady = false;
|
|
||||||
+
|
|
||||||
IndexSearcher * searcher = _CLNEW IndexSearcher(&ram);
|
|
||||||
_LUCENE_THREADID_TYPE thread = _LUCENE_THREAD_CREATE(&searchDocs, searcher);
|
|
||||||
- SCOPED_LOCK_MUTEX(searchMutex);
|
|
||||||
|
|
||||||
- CONDITION_WAIT(searchMutex, searchCondition);
|
|
||||||
+ {
|
|
||||||
+ SCOPED_LOCK_MUTEX(searchMutex);
|
|
||||||
+ while (!searchReady) {
|
|
||||||
+ CONDITION_WAIT(searchMutex, searchCondition);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
searcher->close();
|
|
||||||
_CLLDELETE(searcher);
|
|
||||||
- CONDITION_NOTIFYALL(deleteCondition);
|
|
||||||
+
|
|
||||||
+ {
|
|
||||||
+ SCOPED_LOCK_MUTEX(deleteMutex);
|
|
||||||
+ deleteReady = true;
|
|
||||||
+ CONDITION_NOTIFYALL(deleteCondition);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
_LUCENE_THREAD_JOIN(thread);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
diff -up clucene-core-2.3.3.4/src/core/CMakeLists.txt.CLuceneConfig.cmake clucene-core-2.3.3.4/src/core/CMakeLists.txt
|
|
||||||
--- clucene-core-2.3.3.4/src/core/CMakeLists.txt.CLuceneConfig.cmake 2011-03-16 19:21:07.000000000 -0500
|
|
||||||
+++ clucene-core-2.3.3.4/src/core/CMakeLists.txt 2014-10-07 19:32:17.042894690 -0500
|
|
||||||
@@ -251,8 +251,8 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/
|
|
||||||
set(CLUCENE_VERSION ${CLUCENE_VERSION})
|
|
||||||
set(CLUCENE_SOVERSION ${CLUCENE_SOVERSION})
|
|
||||||
")
|
|
||||||
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake"
|
|
||||||
- DESTINATION ${LIB_DESTINATION}/CLuceneConfig.cmake)
|
|
||||||
+#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake"
|
|
||||||
+# DESTINATION ${LIB_DESTINATION}/CLuceneConfig.cmake)
|
|
||||||
|
|
||||||
# install pkg-config file
|
|
||||||
IF(NOT WIN32)
|
|
@ -1,42 +0,0 @@
|
|||||||
diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt
|
|
||||||
--- clucene-core-2.3.3.4/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300
|
|
||||||
+++ clucene-core-2.3.3.4-mod/CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400
|
|
||||||
@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS )
|
|
||||||
SET(BUILD_CONTRIBS_LIB 1)
|
|
||||||
ENDIF ( BUILD_CONTRIBS )
|
|
||||||
IF ( BUILD_CONTRIBS_LIB )
|
|
||||||
- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
|
|
||||||
+ ADD_SUBDIRECTORY (src/contribs-lib)
|
|
||||||
ENDIF ( BUILD_CONTRIBS_LIB )
|
|
||||||
|
|
||||||
|
|
||||||
diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt
|
|
||||||
--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300
|
|
||||||
+++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400
|
|
||||||
@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED
|
|
||||||
)
|
|
||||||
TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
|
|
||||||
|
|
||||||
+#install public headers.
|
|
||||||
+FOREACH(file ${HEADERS})
|
|
||||||
+ get_filename_component(apath ${file} PATH)
|
|
||||||
+ get_filename_component(aname ${file} NAME)
|
|
||||||
+ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
|
|
||||||
+ IF ( NOT aname MATCHES "^_.*" )
|
|
||||||
+ install(FILES ${file}
|
|
||||||
+ DESTINATION include/${relpath}
|
|
||||||
+ COMPONENT development)
|
|
||||||
+ ENDIF ( NOT aname MATCHES "^_.*" )
|
|
||||||
+ENDFOREACH(file)
|
|
||||||
+
|
|
||||||
#set properties on the libraries
|
|
||||||
SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
|
|
||||||
VERSION ${CLUCENE_VERSION}
|
|
||||||
SOVERSION ${CLUCENE_SOVERSION}
|
|
||||||
COMPILE_DEFINITIONS_DEBUG _DEBUG
|
|
||||||
)
|
|
||||||
+
|
|
||||||
+#and install library
|
|
||||||
+install(TARGETS clucene-contribs-lib
|
|
||||||
+ DESTINATION ${LIB_DESTINATION}
|
|
||||||
+ COMPONENT runtime )
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
|
|
||||||
--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes 2011-03-16 19:21:07.000000000 -0500
|
|
||||||
+++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake 2012-03-19 09:01:00.689263954 -0500
|
|
||||||
@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i
|
|
||||||
Name: libclucene
|
|
||||||
Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
|
|
||||||
Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@
|
|
||||||
-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
|
|
||||||
-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
|
|
||||||
+Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
|
|
||||||
+Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@
|
|
||||||
~
|
|
@ -1,11 +0,0 @@
|
|||||||
diff -up clucene-core-2.3.3.4/src/test/search/TestIndexSearcher.cpp.usleep clucene-core-2.3.3.4/src/test/search/TestIndexSearcher.cpp
|
|
||||||
--- clucene-core-2.3.3.4/src/test/search/TestIndexSearcher.cpp.usleep 2011-03-16 19:21:07.000000000 -0500
|
|
||||||
+++ clucene-core-2.3.3.4/src/test/search/TestIndexSearcher.cpp 2014-10-07 19:35:20.854480798 -0500
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
* Distributable under the terms of either the Apache License (Version 2.0) or
|
|
||||||
* the GNU Lesser General Public License, as specified in the COPYING file.
|
|
||||||
------------------------------------------------------------------------------*/
|
|
||||||
+#include <unistd.h>
|
|
||||||
#include "test.h"
|
|
||||||
|
|
||||||
DEFINE_MUTEX(searchMutex);
|
|
359
clucene.spec
359
clucene.spec
@ -1,359 +0,0 @@
|
|||||||
|
|
||||||
%global git_long e8e3d20f20da5ee3e37d347207b01890829a5475
|
|
||||||
%global git_short e8e3d20
|
|
||||||
%global snap 20130812
|
|
||||||
|
|
||||||
# rpmdev-bumpspec / releng automation compatible
|
|
||||||
%global baserelease 46
|
|
||||||
|
|
||||||
Summary: A C++ port of Lucene
|
|
||||||
Name: clucene
|
|
||||||
Version: 2.3.3.4
|
|
||||||
Release: %{baserelease}.%{snap}.%{git_short}git%{?dist}
|
|
||||||
License: LGPLv2+ or ASL 2.0
|
|
||||||
URL: http://www.sourceforge.net/projects/clucene
|
|
||||||
%if 0%{?snap}
|
|
||||||
# git archive e8e3d20f20da5ee3e37d347207b01890829a5475 --prefix=clucene-core-2.3.3.4/ | xz -9 > ../clucene-core-2.3.3.4-e8e3d20.tar.xz
|
|
||||||
Source0: clucene-core-2.3.3.4-%{git_short}.tar.xz
|
|
||||||
|
|
||||||
%else
|
|
||||||
Source0: http://downloads.sourceforge.net/clucene/clucene-core-%{version}.tar.gz
|
|
||||||
%endif
|
|
||||||
|
|
||||||
BuildRequires: boost-devel
|
|
||||||
BuildRequires: cmake
|
|
||||||
BuildRequires: gawk
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: zlib-devel
|
|
||||||
BuildRequires: make
|
|
||||||
|
|
||||||
## upstreamable patches
|
|
||||||
# include LUCENE_SYS_INCLUDES in pkgconfig --cflags output
|
|
||||||
# https://bugzilla.redhat.com/748196
|
|
||||||
# and
|
|
||||||
# https://sourceforge.net/tracker/?func=detail&aid=3461512&group_id=80013&atid=558446
|
|
||||||
# pkgconfig file is missing clucene-shared
|
|
||||||
Patch50: clucene-core-2.3.3.4-pkgconfig.patch
|
|
||||||
# https://bugzilla.redhat.com/794795
|
|
||||||
# https://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446
|
|
||||||
# contribs-lib is not built and installed even with config
|
|
||||||
Patch51: clucene-core-2.3.3.4-install_contribs_lib.patch
|
|
||||||
# Don't install CLuceneConfig.cmake twice
|
|
||||||
Patch52: clucene-core-2.3.3.4-CLuceneConfig.patch
|
|
||||||
# Fix tests for undefined usleep
|
|
||||||
Patch53: clucene-core-2.3.3.4-usleep.patch
|
|
||||||
# Upstream at <https://sourceforge.net/p/clucene/bugs/232/> "Patches for
|
|
||||||
# TestIndexSearcher failures":
|
|
||||||
Patch54: 0001-Make-sure-to-return-value-from-non-void-function.patch
|
|
||||||
Patch55: 0002-Avoid-deadlock-in-TestIndexSearcher.patch
|
|
||||||
# Upstream at <https://sourceforge.net/p/clucene/code/merge-requests/3/> "Fix
|
|
||||||
# missing #include <time.h>":
|
|
||||||
Patch56: 0001-Fix-missing-include-time.h.patch
|
|
||||||
|
|
||||||
%description
|
|
||||||
CLucene is a C++ port of the popular Apache Lucene search engine
|
|
||||||
(http://lucene.apache.org/java).
|
|
||||||
CLucene aims to be a high-speed alternative to Java Lucene, its API is very
|
|
||||||
similar to that of the Java version. CLucene has recently been brought up to
|
|
||||||
date with Lucene 2.3.2. It contains most of the same functionality as the Java version.
|
|
||||||
|
|
||||||
%package core
|
|
||||||
Summary: Core clucene module
|
|
||||||
Provides: clucene = %{version}-%{release}
|
|
||||||
#Requires: %{name} = %{version}-%{release}
|
|
||||||
%description core
|
|
||||||
CLucene is a C++ port of the popular Apache Lucene search engine
|
|
||||||
(http://lucene.apache.org/java).
|
|
||||||
CLucene aims to be a high-speed alternative to Java Lucene, its API is very
|
|
||||||
similar to that of the Java version. CLucene has recently been brought up to
|
|
||||||
date with Lucene 2.3.2. It contains most of the same functionality as the Java version.
|
|
||||||
|
|
||||||
%package core-devel
|
|
||||||
Summary: Headers for developing programs that will use %{name}
|
|
||||||
Requires: %{name}-core%{?_isa} = %{version}-%{release}
|
|
||||||
Requires: %{name}-contribs-lib%{?_isa} = %{version}-%{release}
|
|
||||||
%description core-devel
|
|
||||||
This package contains the libraries and header files needed for
|
|
||||||
developing with clucene
|
|
||||||
|
|
||||||
%package contribs-lib
|
|
||||||
Summary: Language specific text analyzers for %{name}
|
|
||||||
Requires: %{name}-core%{?_isa} = %{version}-%{release}
|
|
||||||
%description contribs-lib
|
|
||||||
%{summary}.
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -n %{name}-core-%{version}
|
|
||||||
|
|
||||||
%patch50 -p1 -b .pkgconfig
|
|
||||||
%patch51 -p1 -b .install_contribs_lib
|
|
||||||
%patch52 -p1 -b .CLuceneConfig
|
|
||||||
%patch53 -p1 -b .usleep
|
|
||||||
%patch54 -p1 -b .return-value
|
|
||||||
%patch55 -p1 -b .avoid-deadlock
|
|
||||||
%patch56 -p1 -b .missing-include
|
|
||||||
|
|
||||||
# nuke bundled code
|
|
||||||
rm -rfv src/ext/{boost/,zlib/}
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
|
||||||
%{cmake} \
|
|
||||||
-DBUILD_CONTRIBS_LIB:BOOL=ON \
|
|
||||||
-DLIB_DESTINATION:PATH=%{_libdir} \
|
|
||||||
-DLUCENE_SYS_INCLUDES:PATH=%{_libdir}
|
|
||||||
|
|
||||||
%cmake_build
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
%cmake_install
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
|
||||||
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
|
|
||||||
test "$(pkg-config --modversion libclucene-core)" = "%{version}"
|
|
||||||
# FIXME: make tests non-fatal for ppc and s390 (big endian 32 bit archs) until we have a proper fix
|
|
||||||
#ifnarch ppc s390
|
|
||||||
export CTEST_OUTPUT_ON_FAILURE=1
|
|
||||||
# needing the 'touch' here seems an odd workaroudn for missing dependency, race condition or cache requirement
|
|
||||||
touch src/test/CMakeLists.txt && \
|
|
||||||
make -C %{_target_platform} cl_test && \
|
|
||||||
time make -C %{_target_platform} test ARGS="--timeout 300 --output-on-failure" ||:
|
|
||||||
#endif
|
|
||||||
|
|
||||||
%ldconfig_scriptlets core
|
|
||||||
|
|
||||||
%files core
|
|
||||||
%doc AUTHORS ChangeLog README
|
|
||||||
%license APACHE.license COPYING LGPL.license
|
|
||||||
%{_libdir}/libclucene-core.so.1*
|
|
||||||
%{_libdir}/libclucene-core.so.%{version}
|
|
||||||
%{_libdir}/libclucene-shared.so.1*
|
|
||||||
%{_libdir}/libclucene-shared.so.%{version}
|
|
||||||
|
|
||||||
%ldconfig_scriptlets contribs-lib
|
|
||||||
|
|
||||||
%files contribs-lib
|
|
||||||
%{_libdir}/libclucene-contribs-lib.so.1*
|
|
||||||
%{_libdir}/libclucene-contribs-lib.so.%{version}
|
|
||||||
|
|
||||||
%files core-devel
|
|
||||||
%dir %{_libdir}/CLucene
|
|
||||||
%{_includedir}/CLucene/
|
|
||||||
%{_includedir}/CLucene.h
|
|
||||||
%{_libdir}/libclucene*.so
|
|
||||||
%{_libdir}/CLucene/clucene-config.h
|
|
||||||
%{_libdir}/CLucene/CLuceneConfig.cmake
|
|
||||||
%{_libdir}/pkgconfig/libclucene-core.pc
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-46.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-45.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Oct 18 2022 Stephan Bergmann <sbergman@redhat.com> - 2.3.3.4-44.20130812.e8e3d20git
|
|
||||||
- Fix FTBFS (missing #include <time.h>)
|
|
||||||
|
|
||||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-43.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-42.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-41.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-40.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-39.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jul 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 2.3.3.4-38.20130812.e8e3d20.git
|
|
||||||
- pull in some upstream fixes (PR, previous commit)
|
|
||||||
- use latest %%cmake macros
|
|
||||||
- s/define/global/
|
|
||||||
|
|
||||||
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.3.3.4-37.20130812.e8e3d20git
|
|
||||||
- Use make macros
|
|
||||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-36.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-35.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-34.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-33.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 2.3.3.4-3220130812.e8e3d20git
|
|
||||||
- BR: gcc-c++, .spec cleanup
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-31.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Feb 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.3.3.4-30.20130812.e8e3d20git
|
|
||||||
- Switch to %%ldconfig_scriptlets
|
|
||||||
|
|
||||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-29.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-28.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 03 2017 Jonathan Wakely <jwakely@redhat.com> - 2.3.3.4-27.20130812.e8e3d20git
|
|
||||||
- Rebuilt for Boost 1.64
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-26.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 2.3.3.4-25.20130812.e8e3d20git
|
|
||||||
- Rebuilt for Boost 1.63
|
|
||||||
|
|
||||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3.4-24.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 2.3.3.4-23.20130812.e8e3d20git
|
|
||||||
- Rebuilt for Boost 1.60
|
|
||||||
|
|
||||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 2.3.3.4-22.20130812.e8e3d20git
|
|
||||||
- Rebuilt for Boost 1.59
|
|
||||||
|
|
||||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3.4-21.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
|
||||||
|
|
||||||
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 2.3.3.4-20.20130812.e8e3d20git
|
|
||||||
- rebuild for Boost 1.58
|
|
||||||
|
|
||||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3.4-19.20130812.e8e3d20git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.3.3.4-18.20130812.e8e3d20git
|
|
||||||
- Rebuilt for GCC 5 C++11 ABI change
|
|
||||||
|
|
||||||
* Mon Jan 26 2015 Petr Machata <pmachata@redhat.com> - 2.3.3.4-17.20130812.e8e3d20git
|
|
||||||
- Rebuild for boost 1.57.0
|
|
||||||
|
|
||||||
* Thu Oct 09 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3.4-16.20130812.e8e3d20git
|
|
||||||
- %%check: more love
|
|
||||||
|
|
||||||
* Thu Oct 09 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3.4-15.20130812.e8e3d20git
|
|
||||||
- fix minor cmake macro syntax error
|
|
||||||
|
|
||||||
* Tue Oct 07 2014 Rex Dieter <rdieter@fedoraproject.org> - 2.3.3.4-14.20130812.e8e3d20git
|
|
||||||
- 20130812 git snapshot
|
|
||||||
- fix tests
|
|
||||||
- %%prep: explicitly delete bundled boost,zlib
|
|
||||||
|
|
||||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3.4-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3.4-12
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 2.3.3.4-11
|
|
||||||
- Rebuild for boost 1.55.0
|
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3.4-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 2.3.3.4-9
|
|
||||||
- Rebuild for boost 1.54.0
|
|
||||||
|
|
||||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3.4-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3.4-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Mar 19 2012 Rex Dieter <rdieter@fedoraproject.org> 2.3.3.4-6
|
|
||||||
- contribs-lib is not built and installed even with config (#794795, upstream ID: 3392466)
|
|
||||||
- pkgconfig file is missing clucene-shared (upstream ID: 3461512)
|
|
||||||
- non-descriptive descripton (#757319)
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 2.3.3.4-5
|
|
||||||
- Temporarily disable make check as it fails on all arches
|
|
||||||
|
|
||||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Oct 23 2011 Rex Dieter <rdieter@fedoraproject.org> 2.3.3.4-3
|
|
||||||
- include LUCENE_SYS_INCLUDES in pkgconfig --cflags output (#748196)
|
|
||||||
|
|
||||||
* Wed Jun 08 2011 Rex Dieter <rdieter@fedoraproject.org> 2.3.3.4-2
|
|
||||||
- cleanup cmake usage
|
|
||||||
- fix scriptlets
|
|
||||||
- track sonames
|
|
||||||
|
|
||||||
* Thu Jun 02 2011 Deji Akingunola <dakingun@gmail.com> - 2.3.3.4-1
|
|
||||||
- Update to version 2.3.3.4
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.21b-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 08 2010 Deji Akingunola <dakingun@gmail.com> 0.9.21b-2
|
|
||||||
- Include the license text in the -core subpackage.
|
|
||||||
|
|
||||||
* Sun Jun 06 2010 Robert Scheck <robert@fedoraproject.org> 0.9.21b-1
|
|
||||||
- Update to 0.9.21b
|
|
||||||
|
|
||||||
* Wed Nov 04 2009 Dennis Gilmore <dennis@ausil.us> - 0.9.21-5
|
|
||||||
- disable 'make check on sparc64 along with ppc64 and s390x
|
|
||||||
|
|
||||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.21-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Apr 14 2009 Karsten Hopp <karsten@redhat.com> 0.9.21-3
|
|
||||||
- bypass 'make check' on s390x, similar to ppc64
|
|
||||||
|
|
||||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.21-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Aug 27 2008 Deji Akingunola <dakingun@gmail.com> - 0.9.21-1
|
|
||||||
- Update to version 0.9.21
|
|
||||||
|
|
||||||
* Sun Feb 10 2008 Deji Akingunola <dakingun@gmail.com> - 0.9.20-4
|
|
||||||
- Rebuild for gcc43
|
|
||||||
|
|
||||||
* Wed Oct 25 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.20-3
|
|
||||||
- Fix a typo in the License field
|
|
||||||
|
|
||||||
* Wed Oct 25 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.20-2
|
|
||||||
- Fix multiarch conflicts (BZ #340891)
|
|
||||||
- Bypass 'make check' for ppc64, its failing two tests there
|
|
||||||
|
|
||||||
* Tue Aug 21 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.20-1
|
|
||||||
- Update to version 0.9.20
|
|
||||||
|
|
||||||
* Sat Aug 11 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.19-1
|
|
||||||
- Latest release update
|
|
||||||
|
|
||||||
* Fri Aug 03 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.16a-2
|
|
||||||
- License tag update
|
|
||||||
|
|
||||||
* Thu Feb 22 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.16a-2
|
|
||||||
- Add -contrib subpackage
|
|
||||||
|
|
||||||
* Thu Dec 07 2006 Deji Akingunola <dakingun@gmail.com> - 0.9.16a-1
|
|
||||||
- Update to latest stable release
|
|
||||||
- Run make check during build
|
|
||||||
|
|
||||||
* Mon Nov 20 2006 Deji Akingunola <dakingun@gmail.com> - 0.9.15-3
|
|
||||||
- Don't package APACHE.license since we've LGPL instead
|
|
||||||
- Package documentation in devel subpackage
|
|
||||||
|
|
||||||
* Mon Nov 13 2006 Deji Akingunola <dakingun@gmail.com> - 0.9.15-2
|
|
||||||
- Fix a bunch of issues with the spec (#215258)
|
|
||||||
- Moved the header file away from lib dir
|
|
||||||
|
|
||||||
* Sat Nov 04 2006 Deji Akingunola <dakingun@gmail.com> - 0.9.15-1
|
|
||||||
- Initial packaging for Fedora Extras
|
|
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
|||||||
|
clucene was removed due to minimization efforts prior to public launch
|
Loading…
Reference in New Issue
Block a user