From 035d70862b6dd074ba9604b93d5ec73dcc54a322 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 26 Oct 2014 00:34:04 +0200 Subject: [PATCH] BR and rebuild against reference-counting-enabled clucene09 (#1128293) * Sat Oct 25 2014 Kevin Kofler 5.4.0-0.2.beta - BR and rebuild against reference-counting-enabled clucene09 (#1128293) --- qt5-qttools.spec | 14 +++++++------- qttools-opensource-src-5.3.0-system-clucene.patch | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 88e18a3..a987491 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,6 +1,8 @@ %global qt_module qttools +%if 0%{?fedora} || 0%{?rhel} > 6 %global system_clucene 1 +%endif # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available @@ -14,7 +16,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.4.0 -Release: 0.1.%{pre}%{?dist} +Release: 0.2.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -49,12 +51,7 @@ BuildRequires: qt5-qtdeclarative-static BuildRequires: qt5-qtwebkit-devel %if 0%{?system_clucene} -%if 0%{?fedora} || 0%{?rhel} > 6 -BuildRequires: clucene09-core-devel -%else -BuildConflicts: clucene-core-devel > 2 -BuildRequires: clucene-core-devel -%endif +BuildRequires: clucene09-core-devel >= 0.9.21b-11 %endif %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} @@ -367,6 +364,9 @@ fi %changelog +* Sat Oct 25 2014 Kevin Kofler 5.4.0-0.2.beta +- BR and rebuild against reference-counting-enabled clucene09 (#1128293) + * Sat Oct 18 2014 Rex Dieter 5.4.0-0.1.beta - 5.4.0-beta diff --git a/qttools-opensource-src-5.3.0-system-clucene.patch b/qttools-opensource-src-5.3.0-system-clucene.patch index 21fd880..343d2a9 100644 --- a/qttools-opensource-src-5.3.0-system-clucene.patch +++ b/qttools-opensource-src-5.3.0-system-clucene.patch @@ -126,7 +126,7 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.s +INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS] +LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene -+DEFINES += LUCENE_ENABLE_REFCOUNT ++#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!) +QMAKE_CXXFLAGS += -fpermissive #Header files