rpms/qt5-qttools
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BR and rebuild against reference-counting-enabled clucene09 (#1128293)

Browse Source 
* Sat Oct 25 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.4.0-0.2.beta
- BR and rebuild against reference-counting-enabled clucene09 (#1128293)
This commit is contained in:
Kevin Kofler 2014-10-26 00:34:04 +02:00
parent 377894093a
commit 035d70862b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt5-qttools.spec
View File

@ -1,6 +1,8 @@
%global qt_module qttools %global qt_module qttools
%if 0%{?fedora} || 0%{?rhel} > 6
%global system_clucene 1 %global system_clucene 1
%endif
# define to build docs, need to undef this for bootstrapping # define to build docs, need to undef this for bootstrapping
# where qt5-qttools builds are not yet available # where qt5-qttools builds are not yet available
@ -14,7 +16,7 @@
Summary: Qt5 - QtTool components Summary: Qt5 - QtTool components
Name: qt5-qttools Name: qt5-qttools
Version: 5.4.0 Version: 5.4.0
Release: 0.1.%{pre}%{?dist} Release: 0.2.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -49,12 +51,7 @@ BuildRequires: qt5-qtdeclarative-static
BuildRequires: qt5-qtwebkit-devel BuildRequires: qt5-qtwebkit-devel
%if 0%{?system_clucene} %if 0%{?system_clucene}
%if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: clucene09-core-devel >= 0.9.21b-11
BuildRequires: clucene09-core-devel
%else
BuildConflicts: clucene-core-devel > 2
BuildRequires: clucene-core-devel
%endif
%endif %endif
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@ -367,6 +364,9 @@ fi
%changelog %changelog
* Sat Oct 25 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.4.0-0.2.beta
- BR and rebuild against reference-counting-enabled clucene09 (#1128293)
* Sat Oct 18 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.1.beta * Sat Oct 18 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.1.beta
- 5.4.0-beta - 5.4.0-beta

2
qttools-opensource-src-5.3.0-system-clucene.patch
View File

@ -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] +INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene +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 +QMAKE_CXXFLAGS += -fpermissive
#Header files #Header files