Hello community, here is the log from the commit of package lucene++ for openSUSE:Factory checked in at 2014-10-22 16:23:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lucene++ (Old) and /work/SRC/openSUSE:Factory/.lucene++.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lucene++" Changes: -------- New Changes file: --- /dev/null 2014-09-26 12:09:11.568032006 +0200 +++ /work/SRC/openSUSE:Factory/.lucene++.new/lucene++.changes 2014-10-22 16:23:44.000000000 +0200 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Sun Oct 19 19:34:10 UTC 2014 - [email protected] + +- fixes for .pc files in lucene++-3.0.6-pc_files_fix.patch +- add upstream patch lucene++-3.0.6-multiarch.patch to work with + %cmake makro +- fix build for openSUSE 12.3 + +------------------------------------------------------------------- +Sat Oct 18 09:55:11 UTC 2014 - [email protected] + +- 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 New: ---- lucene++-3.0.6-fix_installing_headers.patch lucene++-3.0.6-multiarch.patch lucene++-3.0.6-pc_files_fix.patch lucene++-3.0.6.tar.gz lucene++.changes lucene++.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lucene++.spec ++++++ # # 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 Patch3: lucene++-3.0.6-multiarch.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 %patch3 -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 %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 %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 ++++++ lucene++-3.0.6-fix_installing_headers.patch ++++++ >From 994f03cf736229044a168835ae7387696041658f Mon Sep 17 00:00:00 2001 From: rezso <[email protected]> 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) ++++++ lucene++-3.0.6-multiarch.patch ++++++ >From fcdcf1945f0325c8dfdcdfa03ae8af5247602e6e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna <[email protected]> Date: Wed, 2 Jul 2014 17:20:57 +0200 Subject: [PATCH] enable multiarch lib location References: https://github.com/luceneplusplus/LucenePlusPlus/commit/4c533e7f87ce6032284c44d12e022dc2498b49df Uptream: committed Cherry picked from ubuntu lucene++ package --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ae96b7..4b74427 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,9 +75,10 @@ set(lucene_boost_libs include(Lucene++Docs) include(TestCXXAcceptsFlag) +include(GNUInstallDirs) set(LIB_DESTINATION - "lib" CACHE STRING "Define lib output directory name" + "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Define lib output directory name" ) if(ENABLE_CYCLIC_CHECK) ++++++ lucene++-3.0.6-pc_files_fix.patch ++++++ >From c5ed014df578f2be4c48ac8e6f09d6450d1a2a03 Mon Sep 17 00:00:00 2001 From: rezso <[email protected]> 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(-) Index: LucenePlusPlus-rel_3.0.6/liblucene++-contrib.pc.cmake =================================================================== --- LucenePlusPlus-rel_3.0.6.orig/liblucene++-contrib.pc.cmake 2014-10-19 19:13:45.000000000 +0100 +++ LucenePlusPlus-rel_3.0.6/liblucene++-contrib.pc.cmake 2014-10-19 19:18:37.000000000 +0100 @@ -1,14 +1,13 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix}/bin -libdir=@LIB_DESTINATION@ +libdir=@LIB_INSTALL_DIR@ 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@LIB_INSTALL_DIR@ -l${lib} Cflags: -I${includedir} -Requires: liblucene++=@lucene++_VERSION@ -~ +Requires: liblucene++ = @lucene++_VERSION@ Index: LucenePlusPlus-rel_3.0.6/liblucene++.pc.cmake =================================================================== --- LucenePlusPlus-rel_3.0.6.orig/liblucene++.pc.cmake 2014-10-19 19:13:45.000000000 +0100 +++ LucenePlusPlus-rel_3.0.6/liblucene++.pc.cmake 2014-10-19 19:18:19.000000000 +0100 @@ -1,13 +1,12 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix}/bin -libdir=@LIB_DESTINATION@ +libdir=@LIB_INSTALL_DIR@ 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@LIB_INSTALL_DIR@ -l${lib} Cflags: -I${includedir} -~ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
