update to 3.0.7 [release 3.0.7-1mamba;Wed Mar 30 2016]
This commit is contained in:
parent
f9a7e731d1
commit
fa4a256888
37
luceneplusplus-3.0.7-libboost-1.58.patch
Normal file
37
luceneplusplus-3.0.7-libboost-1.58.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
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,5 +1,5 @@
|
|||||||
Name: luceneplusplus
|
Name: luceneplusplus
|
||||||
Version: 3.0.6
|
Version: 3.0.7
|
||||||
Release: 1mamba
|
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
|
||||||
@ -10,6 +10,7 @@ URL: https://github.com/luceneplusplus/LucenePlusPlus
|
|||||||
## GITSOURCE https://github.com/luceneplusplus/LucenePlusPlus.git master
|
## GITSOURCE https://github.com/luceneplusplus/LucenePlusPlus.git master
|
||||||
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
|
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
|
||||||
@ -24,28 +25,31 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|||||||
%description
|
%description
|
||||||
An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine.
|
An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine.
|
||||||
|
|
||||||
%package -n lib%{name}
|
%package -n liblucene++
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Shared libraries for %{name}
|
Summary: An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine
|
||||||
|
Provides: libluceneplusplus
|
||||||
|
Obsoletes: libluceneplusplus
|
||||||
|
|
||||||
%description -n lib%{name}
|
%description -n liblucene++
|
||||||
This package contains shared libraries for %{name}.
|
An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine.
|
||||||
|
|
||||||
%package -n lib%{name}-devel
|
%package -n liblucene++-devel
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for liblucene++
|
||||||
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
Requires: liblucene++ = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
## note: you can add this requirement if .pc files are provided by this package
|
Provides: libluceneplusplus-devel
|
||||||
#Requires: pkg-config
|
Obsoletes: libluceneplusplus-devel
|
||||||
|
Requires: pkg-config
|
||||||
|
|
||||||
%description -n lib%{name}-devel
|
%description -n liblucene++-devel
|
||||||
This package contains libraries and header files for developing applications that use %{name}.
|
This package contains libraries and header files for developing applications that use %{name}.
|
||||||
|
|
||||||
%debug_package
|
%debug_package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n LucenePlusPlus-%{version}
|
%setup -q -n LucenePlusPlus-%{version}
|
||||||
%patch0 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake -d build \
|
%cmake -d build \
|
||||||
@ -60,15 +64,15 @@ This package contains libraries and header files for developing applications tha
|
|||||||
%clean
|
%clean
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
|
|
||||||
%post -n lib%{name} -p /sbin/ldconfig
|
%post -n liblucene++ -p /sbin/ldconfig
|
||||||
%postun -n lib%{name} -p /sbin/ldconfig
|
%postun -n liblucene++ -p /sbin/ldconfig
|
||||||
|
|
||||||
%files -n lib%{name}
|
%files -n liblucene++
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/liblucene++-contrib.so.*
|
%{_libdir}/liblucene++-contrib.so.*
|
||||||
%{_libdir}/liblucene++.so.*
|
%{_libdir}/liblucene++.so.*
|
||||||
|
|
||||||
%files -n lib%{name}-devel
|
%files -n liblucene++-devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%dir %{_includedir}/lucene++
|
%dir %{_includedir}/lucene++
|
||||||
%{_includedir}/lucene++/*.h
|
%{_includedir}/lucene++/*.h
|
||||||
@ -80,5 +84,8 @@ This package contains libraries and header files for developing applications tha
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 30 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.7-1mamba
|
||||||
|
- update to 3.0.7
|
||||||
|
|
||||||
* Sat Nov 01 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.6-1mamba
|
* Sat Nov 01 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.6-1mamba
|
||||||
- package created using the webbuild interface
|
- package created using the webbuild interface
|
||||||
|
Loading…
Reference in New Issue
Block a user