From 194f8697dada0039dea74c37cb26f8889f4845d8 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Tue, 27 Feb 2024 10:16:31 +0100 Subject: [PATCH] automatic version update by autodist [release 3.0.9-1mamba;Tue Feb 27 2024] --- luceneplusplus-3.0.6-gcc-4.9.patch | 10 ------- luceneplusplus-3.0.7-libboost-1.58.patch | 37 ------------------------ luceneplusplus.spec | 25 +++++++--------- 3 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 luceneplusplus-3.0.6-gcc-4.9.patch delete mode 100644 luceneplusplus-3.0.7-libboost-1.58.patch diff --git a/luceneplusplus-3.0.6-gcc-4.9.patch b/luceneplusplus-3.0.6-gcc-4.9.patch deleted file mode 100644 index af03690..0000000 --- a/luceneplusplus-3.0.6-gcc-4.9.patch +++ /dev/null @@ -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"; - } - } - diff --git a/luceneplusplus-3.0.7-libboost-1.58.patch b/luceneplusplus-3.0.7-libboost-1.58.patch deleted file mode 100644 index 9ff33fd..0000000 --- a/luceneplusplus-3.0.7-libboost-1.58.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 1987082cf9278a639d772b4f35a8ae2d34944177 -Author: Václav Slavík -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 -+#include - #include "Lucene.h" - #include "MiscUtils.h" - -@@ -22,7 +23,11 @@ public: - - template - static TYPE get(VAR var) { -+#if BOOST_VERSION < 105800 - return var.type() == typeid(TYPE) ? boost::get(var) : TYPE(); -+#else -+ return var.type() == typeid(TYPE) ? boost::relaxed_get(var) : TYPE(); -+#endif - } - - template diff --git a/luceneplusplus.spec b/luceneplusplus.spec index 1a374a3..547a86e 100644 --- a/luceneplusplus.spec +++ b/luceneplusplus.spec @@ -1,6 +1,6 @@ Name: luceneplusplus -Version: 3.0.8 -Release: 2mamba +Version: 3.0.9 +Release: 1mamba Summary: An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine Group: System/Libraries Vendor: openmamba @@ -8,19 +8,13 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/luceneplusplus/LucenePlusPlus 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 ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libboost-devel -BuildRequires: libbzip2-devel BuildRequires: libgcc -BuildRequires: libicu-devel -BuildRequires: liblzma-devel BuildRequires: libstdc++6-devel BuildRequires: libz-devel -BuildRequires: libzstd-devel ## AUTOBUILDREQ-END BuildRequires: cmake Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} @@ -52,7 +46,6 @@ This package contains libraries and header files for developing applications tha %prep %setup -q -n LucenePlusPlus-%{version} -#%patch1 -p1 %build %cmake -d build \ @@ -65,10 +58,6 @@ This package contains libraries and header files for developing applications tha [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -# Fix pkgconfig and cmake install path -mv %{buildroot}%{_includedir}/pkgconfig %{buildroot}%{_libdir}/ -mv %{buildroot}%{_includedir}/cmake %{buildroot}%{_libdir}/ - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -77,8 +66,8 @@ mv %{buildroot}%{_includedir}/cmake %{buildroot}%{_libdir}/ %files -n liblucene++ %defattr(-,root,root) -#%{_libdir}/liblucene++-contrib.so.* %{_libdir}/liblucene++.so.* +%{_libdir}/liblucene++-contrib.so.* %doc COPYING %files -n liblucene++-devel @@ -89,10 +78,16 @@ mv %{buildroot}%{_includedir}/cmake %{buildroot}%{_libdir}/ %{_libdir}/liblucene++.so %{_libdir}/pkgconfig/liblucene++-contrib.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 %changelog +* Tue Feb 27 2024 Automatic Build System 3.0.9-1mamba +- automatic version update by autodist + * Mon Jul 12 2021 Silvan Calarco 3.0.8-2mamba - fix pkgconfig and cmake files installation path