Hello community, here is the log from the commit of package clucene-core for openSUSE:Factory checked in at 2012-03-23 15:11:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clucene-core (Old) and /work/SRC/openSUSE:Factory/.clucene-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clucene-core", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/clucene-core/clucene-core.changes 2012-03-20 17:47:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clucene-core.new/clucene-core.changes 2012-03-23 15:11:26.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 21 12:05:21 UTC 2012 - [email protected] + +- build contrib libs too + +------------------------------------------------------------------- Old: ---- clucene-core-2.3.3.4-pkgconfig_sys_includes.patch New: ---- clucene-2.3.3.4-contrib-libs.patch clucene-2.3.3.4-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clucene-core.spec ++++++ --- /var/tmp/diff_new_pack.hNdzTl/_old 2012-03-23 15:11:28.000000000 +0100 +++ /var/tmp/diff_new_pack.hNdzTl/_new 2012-03-23 15:11:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package clucene-core # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,27 +16,28 @@ # - Name: clucene-core Version: 2.3.3.4 Release: 0 -License: LGPL-2.1 or Apache-2.0 Summary: CLucene is a C++ port of Lucene -Url: http://clucene.sourceforge.net/ +License: LGPL-2.1 or Apache-2.0 Group: Development/Libraries/C and C++ +Url: http://clucene.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf # PATCH-FIX-UPSTREAM [rh#748196] -Patch0: clucene-core-2.3.3.4-pkgconfig_sys_includes.patch +Patch0: clucene-2.3.3.4-pkgconfig.patch +# PATCH-FIX-UPSTREAM [rh#794795] +Patch1: clucene-2.3.3.4-contrib-libs.patch +BuildRequires: boost-devel BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: zlib-devel -BuildRequires: boost-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,9 +57,22 @@ search engine written in C++. CLucene is faster than lucene as it is written in C++. +%package -n libclucene-contribs-lib1 +Summary: Language specific text analyzers for %{name} +Group: Development/Libraries/C and C++ + +%description -n libclucene-contribs-lib1 +CLucene is a C++ port of Lucene. It is a high-performance, full-featured text +search engine written in C++. CLucene is faster than lucene as it is written +in C++. + +This package contains language specific text analyzers for clucene. + + %package devel Summary: Development files for clucene library Group: Development/Libraries/C and C++ +Requires: libclucene-contribs-lib1 = %{version} Requires: libclucene2 = %{version} Requires: libstdc++-devel @@ -72,6 +86,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # the tar ball is stripped like this: rm -rf test/data/reuters* tests/data/utf* # test/data is not allowed to be distributed bnc#253602 @@ -81,7 +96,8 @@ -DCMAKE_CXX_FLAGS="%{optflags}" \ -DCMAKE_C_FLAGS="%{optflags}" \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DLUCENE_SYS_INCLUDES:PATH=%{_libdir} \ + -DLUCENE_SYS_INCLUDES=%{_libdir} \ + -DBUILD_CONTRIBS_LIB=ON \ %ifarch x86_64 ppc64 -DLIB_SUFFIX=64 \ %endif @@ -89,18 +105,27 @@ make %{?_smp_mflags} VERBOSE=1 %install -%make_install +%makeinstall + rm -f %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_libdir}/CLuceneConfig.cmake %post -n libclucene2 -p /sbin/ldconfig - %postun -n libclucene2 -p /sbin/ldconfig %files -n libclucene2 %defattr(-,root,root,-) %doc APACHE.license AUTHORS ChangeLog COPYING doc/ LGPL.license NEWS README README.PACKAGE REQUESTS -%{_libdir}/libclucene*.so.* +%{_libdir}/libclucene-core.so.* +%{_libdir}/libclucene-shared.so.* + +%post -n libclucene-contribs-lib1 -p /sbin/ldconfig +%postun -n libclucene-contribs-lib1 -p /sbin/ldconfig + +%files -n libclucene-contribs-lib1 +%defattr(-, root, root, -) +%{_libdir}/libclucene-contribs-lib.so.1* +%{_libdir}/libclucene-contribs-lib.so.%{version} %files devel %defattr(-,root,root,-) ++++++ clucene-2.3.3.4-contrib-libs.patch ++++++ diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt --- clucene-core-2.3.3.4/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 +++ clucene-core-2.3.3.4-mod/CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400 @@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) SET(BUILD_CONTRIBS_LIB 1) ENDIF ( BUILD_CONTRIBS ) IF ( BUILD_CONTRIBS_LIB ) - ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL) + ADD_SUBDIRECTORY (src/contribs-lib) ENDIF ( BUILD_CONTRIBS_LIB ) diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt --- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 +++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400 @@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED ) TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) +#install public headers. +FOREACH(file ${HEADERS}) + get_filename_component(apath ${file} PATH) + get_filename_component(aname ${file} NAME) + file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) + IF ( NOT aname MATCHES "^_.*" ) + install(FILES ${file} + DESTINATION include/${relpath} + COMPONENT development) + ENDIF ( NOT aname MATCHES "^_.*" ) +ENDFOREACH(file) + #set properties on the libraries SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES VERSION ${CLUCENE_VERSION} SOVERSION ${CLUCENE_SOVERSION} COMPILE_DEFINITIONS_DEBUG _DEBUG ) + +#and install library +install(TARGETS clucene-contribs-lib + DESTINATION ${LIB_DESTINATION} + COMPONENT runtime ) ++++++ clucene-core-2.3.3.4-pkgconfig_sys_includes.patch -> clucene-2.3.3.4-pkgconfig.patch ++++++ --- /work/SRC/openSUSE:Factory/clucene-core/clucene-core-2.3.3.4-pkgconfig_sys_includes.patch 2011-12-02 09:25:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clucene-core.new/clucene-2.3.3.4-pkgconfig.patch 2012-03-23 15:11:26.000000000 +0100 @@ -1,10 +1,12 @@ -diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake ---- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.sys_includes 2011-03-16 19:21:07.000000000 -0500 -+++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake 2011-10-23 14:43:05.325553889 -0500 -@@ -7,5 +7,5 @@ Name: libclucene +diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake +--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes 2011-03-16 19:21:07.000000000 -0500 ++++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake 2012-03-19 09:01:00.689263954 -0500 +@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i + Name: libclucene Description: CLucene - a C++ search engine, ported from the popular Apache Lucene Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ - Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core +-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext ++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared +Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@ ~ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
