Hello community, here is the log from the commit of package clucene-core for openSUSE:Factory checked in at 2018-02-15 13:19:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clucene-core (Old) and /work/SRC/openSUSE:Factory/.clucene-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clucene-core" Thu Feb 15 13:19:00 2018 rev:30 rq:575579 version:2.3.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/clucene-core/clucene-core.changes 2017-02-06 14:32:50.461826370 +0100 +++ /work/SRC/openSUSE:Factory/.clucene-core.new/clucene-core.changes 2018-02-15 13:19:01.398095410 +0100 @@ -1,0 +2,7 @@ +Wed Feb 7 14:12:14 UTC 2018 - tchva...@suse.com + +- Add patch clucene-new-gcc.patch to fix visibility issues +- Use %cmake macros +- Remove few obsolete codepaths + +------------------------------------------------------------------- New: ---- clucene-new-gcc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clucene-core.spec ++++++ --- /var/tmp/diff_new_pack.gMkStr/_old 2018-02-15 13:19:02.210065980 +0100 +++ /var/tmp/diff_new_pack.gMkStr/_new 2018-02-15 13:19:02.214065835 +0100 @@ -1,7 +1,7 @@ # # spec file for package clucene-core # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Version: 2.3.3.4 Release: 0 Summary: CLucene is a C++ port of Lucene -License: LGPL-2.1 or Apache-2.0 +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 @@ -31,19 +31,19 @@ # PATCH-FIX-UPSTREAM [rh#794795] Patch1: clucene-2.3.3.4-contrib-libs.patch Patch2: clucene-kill-ext-includes.diff -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif +Patch3: clucene-new-gcc.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool -BuildRequires: pkg-config -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig +BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif %description CLucene is a C++ port of Lucene. It is a high-performance, full-featured text @@ -53,7 +53,6 @@ %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} @@ -100,28 +99,19 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autopatch -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 %build -cmake . \ - -DCMAKE_CXX_FLAGS="%{optflags}" \ - -DCMAKE_C_FLAGS="%{optflags}" \ - -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DLUCENE_SYS_INCLUDES=%{_libdir} \ +%cmake \ -DBUILD_CONTRIBS_LIB=ON \ -%if "%{_lib}" == "lib64" - -DLIB_SUFFIX=64 \ -%endif - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DLUCENE_SYS_INCLUDES=%{_libdir} make %{?_smp_mflags} VERBOSE=1 %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%cmake_install find %{buildroot} -type f -name "*.la" -delete -print rm -rf %{buildroot}%{_libdir}/CLuceneConfig.cmake @@ -130,36 +120,27 @@ %fdupes -s %{buildroot} %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 +%post -n libclucene-contribs-lib1 -p /sbin/ldconfig +%postun -n libclucene-contribs-lib1 -p /sbin/ldconfig %files -n libclucene-core1 -%defattr(-,root,root,-) %doc APACHE.license AUTHORS ChangeLog COPYING doc/ LGPL.license README README.PACKAGE REQUESTS %{_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 - %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,-) %{_libdir}/libclucene*.so %{_includedir}/CLucene* ++++++ clucene-new-gcc.patch ++++++ Index: clucene-core-2.3.3.4/src/shared/cmake/MacroCheckGccVisibility.cmake =================================================================== --- clucene-core-2.3.3.4.orig/src/shared/cmake/MacroCheckGccVisibility.cmake +++ clucene-core-2.3.3.4/src/shared/cmake/MacroCheckGccVisibility.cmake @@ -15,18 +15,18 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisi # get the gcc version exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) - string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") + string (REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") if (NOT _gcc_version) # clang reports: clang version 1.1 (trunk 95754) - string (REGEX MATCH "clang version ([123]\\.[0-9])" _gcc_version "${_gcc_version_info}") + string (REGEX MATCH "clang version ([0-9]\\.[0-9])" _gcc_version "${_gcc_version_info}") if ( _gcc_version ) string(REGEX REPLACE "clang version (.*)" "\\1.0" _gcc_version "${_gcc_version}" ) endif ( _gcc_version ) # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: if (NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") + string (REGEX REPLACE ".*\\(GCC\\).* ([0-9]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") endif (NOT _gcc_version) endif (NOT _gcc_version)
