automatic version update by autodist [release 3.0.9-1mamba;Tue Feb 27 2024]
This commit is contained in:
parent
89adbc7160
commit
194f8697da
@ -1,10 +0,0 @@
|
|||||||
--- LucenePlusPlus-3.0.6/src/test/util/LuceneTestFixture.cpp.orig 2014-11-05 00:33:28.115937130 +0100
|
|
||||||
+++ LucenePlusPlus-3.0.6/src/test/util/LuceneTestFixture.cpp 2014-11-05 00:33:56.178954479 +0100
|
|
||||||
@@ -21,7 +21,6 @@
|
|
||||||
if (ConcurrentMergeScheduler::anyUnhandledExceptions()) {
|
|
||||||
// Clear the failure so that we don't just keep failing subsequent test cases
|
|
||||||
ConcurrentMergeScheduler::clearUnhandledExceptions();
|
|
||||||
- FAIL() << "ConcurrentMergeScheduler hit unhandled exceptions";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
|||||||
commit 1987082cf9278a639d772b4f35a8ae2d34944177
|
|
||||||
Author: Václav Slavík <vaclav@slavik.io>
|
|
||||||
Date: Mon May 4 18:04:46 2015 +0200
|
|
||||||
|
|
||||||
Fix compilation with Boost 1.58
|
|
||||||
|
|
||||||
1.58 introduces strict type checking in boost::get() and while that's
|
|
||||||
good in theory, the VariantUtils code makes it impractical to use.
|
|
||||||
Instead, use relaxed_get() to get the old behavior. relaxed_get() didn't
|
|
||||||
exist in older versions of Boost, so the code must check BOOST_VERSION.
|
|
||||||
|
|
||||||
Fixes #93.
|
|
||||||
|
|
||||||
diff --git a/include/VariantUtils.h b/include/VariantUtils.h
|
|
||||||
index 1e6c243..5a72e59 100644
|
|
||||||
--- a/include/VariantUtils.h
|
|
||||||
+++ b/include/VariantUtils.h
|
|
||||||
@@ -8,6 +8,7 @@
|
|
||||||
#define VARIANTUTILS_H
|
|
||||||
|
|
||||||
#include <boost/any.hpp>
|
|
||||||
+#include <boost/version.hpp>
|
|
||||||
#include "Lucene.h"
|
|
||||||
#include "MiscUtils.h"
|
|
||||||
|
|
||||||
@@ -22,7 +23,11 @@ public:
|
|
||||||
|
|
||||||
template <typename TYPE, typename VAR>
|
|
||||||
static TYPE get(VAR var) {
|
|
||||||
+#if BOOST_VERSION < 105800
|
|
||||||
return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE();
|
|
||||||
+#else
|
|
||||||
+ return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) : TYPE();
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TYPE, typename VAR>
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: luceneplusplus
|
Name: luceneplusplus
|
||||||
Version: 3.0.8
|
Version: 3.0.9
|
||||||
Release: 2mamba
|
Release: 1mamba
|
||||||
Summary: An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine
|
Summary: An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -8,19 +8,13 @@ Distribution: openmamba
|
|||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: https://github.com/luceneplusplus/LucenePlusPlus
|
URL: https://github.com/luceneplusplus/LucenePlusPlus
|
||||||
Source: https://github.com/luceneplusplus/LucenePlusPlus.git/rel_%{version}/LucenePlusPlus-%{version}.tar.bz2
|
Source: https://github.com/luceneplusplus/LucenePlusPlus.git/rel_%{version}/LucenePlusPlus-%{version}.tar.bz2
|
||||||
Patch0: luceneplusplus-3.0.6-gcc-4.9.patch
|
|
||||||
Patch1: luceneplusplus-3.0.7-libboost-1.58.patch
|
|
||||||
License: Apache License 2.0
|
License: Apache License 2.0
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libboost-devel
|
BuildRequires: libboost-devel
|
||||||
BuildRequires: libbzip2-devel
|
|
||||||
BuildRequires: libgcc
|
BuildRequires: libgcc
|
||||||
BuildRequires: libicu-devel
|
|
||||||
BuildRequires: liblzma-devel
|
|
||||||
BuildRequires: libstdc++6-devel
|
BuildRequires: libstdc++6-devel
|
||||||
BuildRequires: libz-devel
|
BuildRequires: libz-devel
|
||||||
BuildRequires: libzstd-devel
|
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
@ -52,7 +46,6 @@ This package contains libraries and header files for developing applications tha
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n LucenePlusPlus-%{version}
|
%setup -q -n LucenePlusPlus-%{version}
|
||||||
#%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake -d build \
|
%cmake -d build \
|
||||||
@ -65,10 +58,6 @@ This package contains libraries and header files for developing applications tha
|
|||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
%makeinstall -C build
|
%makeinstall -C build
|
||||||
|
|
||||||
# Fix pkgconfig and cmake install path
|
|
||||||
mv %{buildroot}%{_includedir}/pkgconfig %{buildroot}%{_libdir}/
|
|
||||||
mv %{buildroot}%{_includedir}/cmake %{buildroot}%{_libdir}/
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
|
|
||||||
@ -77,8 +66,8 @@ mv %{buildroot}%{_includedir}/cmake %{buildroot}%{_libdir}/
|
|||||||
|
|
||||||
%files -n liblucene++
|
%files -n liblucene++
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
#%{_libdir}/liblucene++-contrib.so.*
|
|
||||||
%{_libdir}/liblucene++.so.*
|
%{_libdir}/liblucene++.so.*
|
||||||
|
%{_libdir}/liblucene++-contrib.so.*
|
||||||
%doc COPYING
|
%doc COPYING
|
||||||
|
|
||||||
%files -n liblucene++-devel
|
%files -n liblucene++-devel
|
||||||
@ -89,10 +78,16 @@ mv %{buildroot}%{_includedir}/cmake %{buildroot}%{_libdir}/
|
|||||||
%{_libdir}/liblucene++.so
|
%{_libdir}/liblucene++.so
|
||||||
%{_libdir}/pkgconfig/liblucene++-contrib.pc
|
%{_libdir}/pkgconfig/liblucene++-contrib.pc
|
||||||
%{_libdir}/pkgconfig/liblucene++.pc
|
%{_libdir}/pkgconfig/liblucene++.pc
|
||||||
%{_libdir}/cmake/liblucene++*.cmake
|
%dir %{_libdir}/cmake/liblucene++-contrib
|
||||||
|
%{_libdir}/cmake/liblucene++-contrib/liblucene++-contrib*.cmake
|
||||||
|
%dir %{_libdir}/cmake/liblucene++
|
||||||
|
%{_libdir}/cmake/liblucene++/liblucene++Config*.cmake
|
||||||
%doc README.PACKAGE
|
%doc README.PACKAGE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 27 2024 Automatic Build System <autodist@openmamba.org> 3.0.9-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Mon Jul 12 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.8-2mamba
|
* Mon Jul 12 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.8-2mamba
|
||||||
- fix pkgconfig and cmake files installation path
|
- fix pkgconfig and cmake files installation path
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user