Hello community, here is the log from the commit of package clucene-core for openSUSE:Factory checked in at 2013-01-29 12:04:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-19 10:50:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clucene-core.new/clucene-core.changes 2013-01-29 12:04:59.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 25 01:20:56 UTC 2013 - [email protected] + +- Replace wrong shlib package name "libclucene2" (the SONAME is + libclucene*.so.1, not .2) by libclucene-{core,shared}1 +- Use more robust make install command +- Add patch clucene-kill-ext-includes.diff + +------------------------------------------------------------------- New: ---- clucene-kill-ext-includes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clucene-core.spec ++++++ --- /var/tmp/diff_new_pack.qJEl60/_old 2013-01-29 12:05:00.000000000 +0100 +++ /var/tmp/diff_new_pack.qJEl60/_new 2013-01-29 12:05:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package clucene-core # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -23,13 +23,15 @@ License: LGPL-2.1 or Apache-2.0 Group: Development/Libraries/C and C++ Url: http://clucene.sourceforge.net/ + +#Git-Clone: git://clucene.git.sourceforge.net/gitroot/clucene/clucene Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf - # PATCH-FIX-UPSTREAM [rh#748196] Patch0: clucene-2.3.3.4-pkgconfig.patch # PATCH-FIX-UPSTREAM [rh#794795] Patch1: clucene-2.3.3.4-contrib-libs.patch +Patch2: clucene-kill-ext-includes.diff BuildRequires: boost-devel BuildRequires: cmake @@ -45,18 +47,28 @@ search engine written in C++. CLucene is faster than lucene as it is written in C++. -%package -n libclucene2 -Summary: Development files for clucene library -Group: Development/Libraries/C and C++ -Provides: %{name} = %{version} -#TODO: Change back to '<' after next version update: -Obsoletes: %{name} <= %{version} +%package -n libclucene-core1 +Summary: C++ implementation of the Lucene text search engine +Group: System/Libraries +# Rip the wrong name. +Obsoletes: libclucene2 < %version-%release +Provides: libclucene2 = %version-%release -%description -n libclucene2 +%description -n libclucene-core1 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++. +%package -n libclucene-shared1 +Summary: CLucene cross-platform layer +Group: System/Libraries + +%description -n libclucene-shared1 +This package creates a library that is used in all the CLucene +projects. It provides cross-platform macros and functions, as well as +things like cl_* string macros, file handling functions, replacement +functions, etc. + %package -n libclucene-contribs-lib1 Summary: Language specific text analyzers for %{name} Group: Development/Libraries/C and C++ @@ -73,7 +85,8 @@ Summary: Development files for clucene library Group: Development/Libraries/C and C++ Requires: libclucene-contribs-lib1 = %{version} -Requires: libclucene2 = %{version} +Requires: libclucene-core1 = %version +Requires: libclucene-shared1 = %version Requires: libstdc++-devel %description devel @@ -87,6 +100,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch -P 2 -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 @@ -105,19 +119,27 @@ make %{?_smp_mflags} VERBOSE=1 %install -%makeinstall +make install DESTDIR="%buildroot" rm -f %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_libdir}/CLuceneConfig.cmake -%post -n libclucene2 -p /sbin/ldconfig -%postun -n libclucene2 -p /sbin/ldconfig +%post -n libclucene-core1 -p /sbin/ldconfig +%postun -n libclucene-core1 -p /sbin/ldconfig +%post -n libclucene-shared1 -p /sbin/ldconfig +%postun -n libclucene-shared1 -p /sbin/ldconfig -%files -n libclucene2 +%files -n libclucene-core1 %defattr(-,root,root,-) %doc APACHE.license AUTHORS ChangeLog COPYING doc/ LGPL.license NEWS README README.PACKAGE REQUESTS -%{_libdir}/libclucene-core.so.* -%{_libdir}/libclucene-shared.so.* +%{_libdir}/libclucene-core.so.1 +%{_libdir}/libclucene-core.so.%version + +%files -n libclucene-shared1 +%defattr(-,root,root) +%doc APACHE.license COPYING LGPL.license +%{_libdir}/libclucene-shared.so.1 +%{_libdir}/libclucene-shared.so.%version %post -n libclucene-contribs-lib1 -p /sbin/ldconfig %postun -n libclucene-contribs-lib1 -p /sbin/ldconfig ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.qJEl60/_old 2013-01-29 12:05:00.000000000 +0100 +++ /var/tmp/diff_new_pack.qJEl60/_new 2013-01-29 12:05:00.000000000 +0100 @@ -1 +1,4 @@ -libclucene2 +libclucene-core1 + provides "libclucene2 = <version>" + obsoletes "libclucene2 < <version>" +libclucene-shared1 ++++++ clucene-kill-ext-includes.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2013-01-25 01:40:24.101555823 +0100+ References: http://sourceforge.net/mailarchive/forum.php?thread_name=1359079095-6295-2-git-send-email-jengelh%40inai.de&forum_name=clucene-developers clucene: avoid causing compile failures in downstream users `pkg-config clucene --cflags` is giving me -I/usr/include/clucene/ext, which causes projects using both clucence and boost to fail in compilation because ext/boost and the regular boost headers do not match up. $ echo -en '#include <boost/filesystem.hpp>' | \ g++ -x c++ $(pkg-config libclucene-core --cflags) -c - In file included from /usr/include/boost/filesystem/v3/path.hpp:27:0, from /usr/include/boost/filesystem.hpp:35, from test.cpp:1: /usr/include/boost/system/system_error.hpp:22:45: error: expected initializer before ‘:’ token In file included from /usr/include/CLucene/ext/boost/detail/sp_typeinfo.hpp:103:0, from /usr/include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_nt.hpp:21, from /usr/include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base.hpp:33, from /usr/include/CLucene/ext/boost/smart_ptr/detail/shared_count.hpp:29, from /usr/include/CLucene/ext/boost/smart_ptr/shared_ptr.hpp:32, from /usr/include/CLucene/ext/boost/shared_ptr.hpp:17, from /usr/include/boost/filesystem/v3/path.hpp:29, from /usr/include/boost/filesystem.hpp:35, from test.cpp:1: /usr/include/c++/4.7/typeinfo:41:37: error: expected ‘}’ before end of line /usr/include/c++/4.7/typeinfo:41:37: error: expected ‘}’ before end of line /usr/include/c++/4.7/typeinfo:41:37: error: expected declaration before end of line Rip out this /ext nonsense. ...and the vim tilde. --- src/core/libclucene-core.pc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake =================================================================== --- clucene-core-2.3.3.4.orig/src/core/libclucene-core.pc.cmake +++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake @@ -7,5 +7,5 @@ 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 -lclucene-shared -Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@ -~ +Cflags: -I${prefix}/include -I@LUCENE_SYS_INCLUDES@ + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
