From 65cd974b346ea866931870021ab8ec0e417f6ac17895dcbd33a5d5eb8cc0c9eb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Dec 2020 14:19:54 +0000 Subject: [PATCH] Accepting request 858775 from home:1Antoine1:branches:devel:libraries:c_c++ Fix build. OBS-URL: https://build.opensuse.org/request/show/858775 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/lucene++?expand=0&rev=10 --- lucene++.changes | 8 ++++++++ lucene++.spec | 52 ++++++++++++------------------------------------ 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/lucene++.changes b/lucene++.changes index e1f5ad7..51beb80 100644 --- a/lucene++.changes +++ b/lucene++.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 26 18:09:24 UTC 2020 - antoine.belvire@opensuse.org + +- Add some build dependencies (used to be implicitly pulled): + * pkgconfig(bzip2) + * pkgconfig(zlib) +- Remove obsolete conditionals. + ------------------------------------------------------------------- Wed Feb 1 14:51:41 UTC 2017 - adam.majer@suse.de diff --git a/lucene++.spec b/lucene++.spec index cd7a338..c940047 100644 --- a/lucene++.spec +++ b/lucene++.spec @@ -1,7 +1,7 @@ # # spec file for package lucene++ # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,25 +20,22 @@ Name: lucene++ Version: 3.0.7 Release: 0 Summary: A high-performance, full-featured text search engine written in C++ -License: Apache-2.0 or LGPL-3.0+ +License: Apache-2.0 OR LGPL-3.0-or-later Group: Development/Libraries/C and C++ -Url: https://github.com/luceneplusplus/LucenePlusPlus +URL: https://github.com/luceneplusplus/LucenePlusPlus Source: https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch1: 0001-Fix-compilation-with-Boost-1.58.patch -%if 0%{?suse_version} > 1325 +BuildRequires: cmake >= 2.8.6 +BuildRequires: gcc-c++ BuildRequires: libboost_filesystem-devel BuildRequires: libboost_iostreams-devel BuildRequires: libboost_regex-devel BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel -%else -BuildRequires: boost-devel -%endif -BuildRequires: cmake >= 2.8.6 -BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: subversion -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(zlib) %description An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine. @@ -63,47 +60,24 @@ Development files for lucene++, a high-performance, full-featured text search en %patch1 -p1 %build -%if 0%{?suse_version} >= 1310 %cmake -%else # openSUSE 12.3 -mkdir build -cd build -cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \ - -DCMAKE_BUILD_TYPE=release \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DCMAKE_C_FLAGS:STRING="%{optflags}" \ - -DCMAKE_CXX_FLAGS:STRING="%{optflags}" -%endif # openSUSE 12.3 -make %{?_smp_mflags} lucene++ -make %{?_smp_mflags} lucene++-contrib +%make_build lucene++ +%make_build lucene++-contrib %install -%if 0%{?suse_version} >= 1310 %cmake_install -%else # openSUSE 12.3 -cd build -make DESTDIR=%{buildroot} install/fast -%endif # openSUSE 12.3 %post -n liblucene++0 -p /sbin/ldconfig - %postun -n liblucene++0 -p /sbin/ldconfig %files -n liblucene++0 -%defattr(-,root,root,-) %{_libdir}/liblucene++.so.* %{_libdir}/liblucene++-contrib.so.* -%doc COPYING APACHE.license GPL.license LGPL.license +%license COPYING APACHE.license GPL.license LGPL.license %doc AUTHORS README* REQUESTS %files devel -%defattr(-,root,root,-) -%doc COPYING APACHE.license GPL.license LGPL.license +%license COPYING APACHE.license GPL.license LGPL.license %{_includedir}/lucene++/ %{_libdir}/liblucene++.so %{_libdir}/liblucene++-contrib.so