From 329b0e39822ae856837d76fda18ffc3e2d4b33ed6d1d0794d6bfca253bcd52d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 18 Oct 2014 14:26:46 +0000 Subject: [PATCH] Accepting request 257517 from home:AndreasStieger:branches:M17N lucene++ 3.0.6, a dependency for poedit 1.6.x OBS-URL: https://build.opensuse.org/request/show/257517 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/lucene++?expand=0&rev=1 --- .gitattributes | 23 ++++++ .gitignore | 1 + lucene++-3.0.6-fix_installing_headers.patch | 44 +++++++++++ lucene++-3.0.6-pc_files_fix.patch | 71 +++++++++++++++++ lucene++-3.0.6.tar.gz | 3 + lucene++.changes | 8 ++ lucene++.spec | 87 +++++++++++++++++++++ 7 files changed, 237 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 lucene++-3.0.6-fix_installing_headers.patch create mode 100644 lucene++-3.0.6-pc_files_fix.patch create mode 100644 lucene++-3.0.6.tar.gz create mode 100644 lucene++.changes create mode 100644 lucene++.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/lucene++-3.0.6-fix_installing_headers.patch b/lucene++-3.0.6-fix_installing_headers.patch new file mode 100644 index 0000000..c7a27f5 --- /dev/null +++ b/lucene++-3.0.6-fix_installing_headers.patch @@ -0,0 +1,44 @@ +From 994f03cf736229044a168835ae7387696041658f Mon Sep 17 00:00:00 2001 +From: rezso +Date: Mon, 19 May 2014 09:20:40 +0100 +Subject: [PATCH] fix installing lucene++ headers in 3.0.6 +Upstream: committed +References: https://github.com/luceneplusplus/LucenePlusPlus/commit/994f03cf736229044a168835ae7387696041658f + +--- + CMakeLists.txt | 8 ++++++++ + src/core/CMakeLists.txt | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +Index: LucenePlusPlus-rel_3.0.6/CMakeLists.txt +=================================================================== +--- LucenePlusPlus-rel_3.0.6.orig/CMakeLists.txt 2014-04-19 19:26:40.000000000 +0100 ++++ LucenePlusPlus-rel_3.0.6/CMakeLists.txt 2014-10-18 10:54:14.000000000 +0100 +@@ -138,6 +138,14 @@ if(NOT WIN32) + DESTINATION ${LIB_DESTINATION}/pkgconfig) + endif() + ++################################# ++# install Config.h ++################################# ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/include/Config.h" ++ DESTINATION include/lucene++) ++ + #################################### + # custom targets + #################################### +Index: LucenePlusPlus-rel_3.0.6/src/core/CMakeLists.txt +=================================================================== +--- LucenePlusPlus-rel_3.0.6.orig/src/core/CMakeLists.txt 2014-04-19 19:26:40.000000000 +0100 ++++ LucenePlusPlus-rel_3.0.6/src/core/CMakeLists.txt 2014-10-18 10:54:14.000000000 +0100 +@@ -20,7 +20,7 @@ file(GLOB_RECURSE lucene_internal_header + ) + + file(GLOB_RECURSE lucene_headers +- include/*.h ++ "${lucene++_SOURCE_DIR}/include/*.h" + ) + + add_definitions(-DLPP_BUILDING_LIB) diff --git a/lucene++-3.0.6-pc_files_fix.patch b/lucene++-3.0.6-pc_files_fix.patch new file mode 100644 index 0000000..2d0c8c9 --- /dev/null +++ b/lucene++-3.0.6-pc_files_fix.patch @@ -0,0 +1,71 @@ +From c5ed014df578f2be4c48ac8e6f09d6450d1a2a03 Mon Sep 17 00:00:00 2001 +From: rezso +Date: Mon, 19 May 2014 09:23:35 +0100 +Subject: [PATCH] lucene++ .pc files fix +Upstream: Committed: +References: https://github.com/luceneplusplus/LucenePlusPlus/commit/c5ed014df578f2be4c48ac8e6f09d6450d1a2a03 + +Without this patch, liblucene++-contrib.pc contains: +> Requires: liblucene++=3.0.6 + +Which breaks pkg-config: +> $ pkg-config --libs liblucene++-contrib +> Package liblucene++=3.0.6 was not found in the pkg-config search path. +> Perhaps you should add the directory containing `liblucene++=3.0.6.pc' +> to the PKG_CONFIG_PATH environment variable +> Package 'liblucene++=3.0.6', required by 'liblucene++-contrib', not found + +The correct line is: +> Requires: liblucene++ = 3.0.6 + +Which returns correctly: +> $ pkg-config --libs liblucene++-contrib +> -L/usr/lib/ -llucene++-contrib -llucene++ + +--- + liblucene++-contrib.pc.cmake | 7 +++---- + liblucene++.pc.cmake | 5 ++--- + 2 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/liblucene++-contrib.pc.cmake b/liblucene++-contrib.pc.cmake +index 3ebf9f9..98b6381 100644 +--- a/liblucene++-contrib.pc.cmake ++++ b/liblucene++-contrib.pc.cmake +@@ -1,14 +1,13 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=@LIB_DESTINATION@ ++libdir=${prefix}/@LIB_DESTINATION@ + includedir=${prefix}/include/lucene++ + lib=lucene++-contrib + + Name: liblucene++-contrib + Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene + Version: @lucene++_VERSION@ +-Libs: -L@LIB_DESTINATION@/ -l${lib} ++Libs: -L${prefix}/@LIB_DESTINATION@ -l${lib} + Cflags: -I${includedir} +-Requires: liblucene++=@lucene++_VERSION@ +-~ ++Requires: liblucene++ = @lucene++_VERSION@ + +diff --git a/liblucene++.pc.cmake b/liblucene++.pc.cmake +index d238e51..c526d4a 100644 +--- a/liblucene++.pc.cmake ++++ b/liblucene++.pc.cmake +@@ -1,13 +1,12 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=@LIB_DESTINATION@ ++libdir=${prefix}/@LIB_DESTINATION@ + includedir=${prefix}/include/lucene++ + lib=lucene++ + + Name: liblucene++ + Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene + Version: @lucene++_VERSION@ +-Libs: -L@LIB_DESTINATION@ -l${lib} ++Libs: -L${prefix}/@LIB_DESTINATION@ -l${lib} + Cflags: -I${includedir} +-~ + diff --git a/lucene++-3.0.6.tar.gz b/lucene++-3.0.6.tar.gz new file mode 100644 index 0000000..f576edd --- /dev/null +++ b/lucene++-3.0.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e7092a4935e0d1ad5c6d7ac8f3c6ed2f53e51321237ce83744bbf02e0d61519 +size 1529066 diff --git a/lucene++.changes b/lucene++.changes new file mode 100644 index 0000000..7992a45 --- /dev/null +++ b/lucene++.changes @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 18 09:55:11 UTC 2014 - andreas.stieger@gmx.de + +- lucene++ 3.0.6, a high-performance, full-featured text search + engine written in C++, +- upstream patches: + * lucene++-3.0.6-pc_files_fix.patch - fix pkgconfig files + * lucene++-3.0.6-fix_installing_headers.patch fix header install diff --git a/lucene++.spec b/lucene++.spec new file mode 100644 index 0000000..4cc7381 --- /dev/null +++ b/lucene++.spec @@ -0,0 +1,87 @@ +# +# spec file for package lucene++ +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +Name: lucene++ +Version: 3.0.6 +Release: 0 +Summary: A high-performance, full-featured text search engine written in C++ +License: Apache-2.0 or LGPL-3.0+ +Group: Development/Libraries/C and C++ +Url: https://github.com/luceneplusplus/LucenePlusPlus +Source: https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch1: lucene++-3.0.6-pc_files_fix.patch +Patch2: lucene++-3.0.6-fix_installing_headers.patch +BuildRequires: boost-devel +BuildRequires: cmake >= 2.8.6 +BuildRequires: gcc-c++ +BuildRequires: pkg-config +BuildRequires: subversion +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine. + +%package -n liblucene++0 +Summary: A high-performance, full-featured text search engine written in C++ + +%description -n liblucene++0 +An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine. + +%package devel +Summary: Development files for lucene++ +Group: Development/Libraries/C and C++ +Requires: liblucene++0 = %{version} + +%description devel +Development files for lucene++, a high-performance, full-featured text search engine written in C++ + +%prep +%setup -q -n LucenePlusPlus-rel_%{version} +%patch1 -p1 +%patch2 -p1 + +%build +%cmake \ + -DLIB_DESTINATION=%{_libdir} +make %{?_smp_mflags} lucene++ +make %{?_smp_mflags} lucene++-contrib + +%install +%cmake_install + +%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 +%doc AUTHORS README* REQUESTS + +%files devel +%defattr(-,root,root,-) +%doc COPYING APACHE.license GPL.license LGPL.license +%{_includedir}/lucene++/ +%{_libdir}/liblucene++.so +%{_libdir}/liblucene++-contrib.so +%{_libdir}/pkgconfig/liblucene++.pc +%{_libdir}/pkgconfig/liblucene++-contrib.pc + +%changelog