From: Jan Rękorajski Date: Tue, 16 Jul 2013 22:10:38 +0000 (+0200) Subject: - removed boost headers and their references, see X-Git-Tag: auto/th/clucene-core-2.3.3.4-2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fclucene-core.git;a=commitdiff_plain;h=99316d304bfa94c8a8856c03778c772da8ea963e - removed boost headers and their references, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715474 for details - rel 2 --- diff --git a/clucene-core.spec b/clucene-core.spec index f02ec3f..04fd3b9 100644 --- a/clucene-core.spec +++ b/clucene-core.spec @@ -2,12 +2,13 @@ Summary: An indexing and searching API Summary(pl.UTF-8): API do indeksowania i wyszukiwania Name: clucene-core Version: 2.3.3.4 -Release: 1 +Release: 2 License: LGPL or Apache v2.0 Group: Libraries Source0: http://downloads.sourceforge.net/clucene/%{name}-%{version}.tar.gz # Source0-md5: 48d647fbd8ef8889e5a7f422c1bfda94 Patch0: %{name}-2.3.3.4-install_contribs_lib.patch +Patch1: remove-boost-headers.patch URL: http://clucene.sourceforge.net/ BuildRequires: cmake BuildRequires: libstdc++-devel @@ -50,6 +51,7 @@ Statyczna biblioteka CLucene. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build install -d build @@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT +# remove boost headers, they are not needed nor used here +%{__rm} -r %{_includedir}/CLucene/ext + %clean rm -rf $RPM_BUILD_ROOT diff --git a/remove-boost-headers.patch b/remove-boost-headers.patch new file mode 100644 index 0000000..09d0369 --- /dev/null +++ b/remove-boost-headers.patch @@ -0,0 +1,16 @@ +--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake~ 2011-03-17 01:21:07.000000000 +0100 ++++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake 2013-07-17 00:09:45.329409095 +0200 +@@ -1,11 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin + libdir=${prefix}/@LIB_DESTINATION@ +-includedir=${prefix}/include:${prefix}/include/CLucene/ext ++includedir=${prefix}/include + + 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 +-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext ++Cflags: -I${prefix}/include + ~