rdieter pushed to qt5-qttools (el6). "Merge branch 'f20'"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 11 04:06:33 UTC 2015 

>From 92cef521c7b85e3447582d05687c9f509cc9c8d8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 3 Dec 2014 23:03:21 -0600
Subject: rebuild (clucene09)


diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 2b3a3b4..cf6bc67 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -12,7 +12,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,6 +358,9 @@ fi
 
 
 %changelog
+* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
+- rebuild (clucene09)
+
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
 
-- 
cgit v0.10.2


>From d91e9dfb43024144b0d264764b0559115b1b75f5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 3 Dec 2014 23:16:15 -0600
Subject: bootstrap


diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index cf6bc67..ac54328 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,18 +1,18 @@
 
 %global qt_module qttools
-%global system_clucene 1
+#global system_clucene 1
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools builds are not yet available
 # only primary archs (for now), allow secondary to bootstrap
-%ifarch %{arm} %{ix86} x86_64
-%define docs 1
-%endif
+#ifarch %{arm} %{ix86} x86_64
+#define docs 1
+#endif
 
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 3%{?dist}
+Release: 2%{?dist}.1
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,8 +358,8 @@ fi
 
 
 %changelog
-* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
-- rebuild (clucene09)
+* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2.1
+- bootstrap
 
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
-- 
cgit v0.10.2


>From 279d24ae1ffea1c86f53c3121f26978b6c32e97b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 4 Dec 2014 06:53:31 -0600
Subject: Revert "bootstrap"

This reverts commit d91e9dfb43024144b0d264764b0559115b1b75f5.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index ac54328..cf6bc67 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,18 +1,18 @@
 
 %global qt_module qttools
-#global system_clucene 1
+%global system_clucene 1
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools builds are not yet available
 # only primary archs (for now), allow secondary to bootstrap
-#ifarch %{arm} %{ix86} x86_64
-#define docs 1
-#endif
+%ifarch %{arm} %{ix86} x86_64
+%define docs 1
+%endif
 
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,8 +358,8 @@ fi
 
 
 %changelog
-* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2.1
-- bootstrap
+* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
+- rebuild (clucene09)
 
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
-- 
cgit v0.10.2


>From aab042cb30276d58e2348f6a5e6addb390b0fafa Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Thu, 4 Dec 2014 21:30:42 +0100
Subject: system-clucene patch fixes: some required QDir::mkpath in QtCLucene,
 cleanups

* Thu Dec 04 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.3.2-4
- system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups
- F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293)
- disable system-clucene where refcounted clucene09 not available (#1128293)

This syncs the system-clucene patch to the version from master (Rawhide)
that actually works, and does aforementioned specfile fixes.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index cf6bc67..0ce986a 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,6 +1,8 @@
 
 %global qt_module qttools
+%if 0%{?fedora} > 19 || 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
@@ -12,7 +14,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -23,7 +25,7 @@ Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%
 Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 %endif
 
-Patch1: qttools-opensource-src-5.3.0-system-clucene.patch
+Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
 
 # help lrelease/lupdate use/prefer qmake-qt5
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
@@ -47,12 +49,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-12
 %endif
 
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -358,6 +355,11 @@ fi
 
 
 %changelog
+* Thu Dec 04 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.3.2-4
+- system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups
+- F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293)
+- disable system-clucene where refcounted clucene09 not available (#1128293)
+
 * Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
 - rebuild (clucene09)
 
diff --git a/qttools-opensource-src-5.3.0-system-clucene.patch b/qttools-opensource-src-5.3.0-system-clucene.patch
deleted file mode 100644
index 21fd880..0000000
--- a/qttools-opensource-src-5.3.0-system-clucene.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri
---- qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.system_clucene	2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri	2014-05-30 12:31:10.921201196 -0500
-@@ -1,125 +1,8 @@
--DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
--win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
--
--CLUCENEDIR = ../3rdparty/clucene/src/CLucene
--
--INCLUDEPATH += . .. \
--               $$CLUCENEDIR \
--               $$CLUCENEDIR/../ \
--               $$CLUCENEDIR/analysis \
--               $$CLUCENEDIR/analysis/standard \
--               $$CLUCENEDIR/config \
--               $$CLUCENEDIR/debug \
--               $$CLUCENEDIR/document \
--               $$CLUCENEDIR/index \
--               $$CLUCENEDIR/queryParser \
--               $$CLUCENEDIR/search \
--               $$CLUCENEDIR/store \
--               $$CLUCENEDIR/util
--
--
--SOURCES += $$CLUCENEDIR/StdHeader.cpp \
--           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
--           $$CLUCENEDIR/analysis/Analyzers.cpp \
--           $$CLUCENEDIR/config/gunichartables.cpp \
--           $$CLUCENEDIR/config/repl_lltot.cpp \
--           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
--           $$CLUCENEDIR/config/repl_tcslwr.cpp \
--           $$CLUCENEDIR/config/repl_tcstod.cpp \
--           $$CLUCENEDIR/config/repl_tcstoll.cpp \
--           $$CLUCENEDIR/config/repl_tprintf.cpp \
--           $$CLUCENEDIR/config/threads.cpp \
--           $$CLUCENEDIR/config/utf8.cpp \
--           $$CLUCENEDIR/debug/condition.cpp \
--           $$CLUCENEDIR/debug/error.cpp \
--           $$CLUCENEDIR/debug/memtracking.cpp \
--           $$CLUCENEDIR/document/DateField.cpp \
--           $$CLUCENEDIR/document/Document.cpp \
--           $$CLUCENEDIR/document/Field.cpp \
--           $$CLUCENEDIR/index/CompoundFile.cpp \
--           $$CLUCENEDIR/index/DocumentWriter.cpp \
--           $$CLUCENEDIR/index/FieldInfos.cpp \
--           $$CLUCENEDIR/index/FieldsReader.cpp \
--           $$CLUCENEDIR/index/FieldsWriter.cpp \
--           $$CLUCENEDIR/index/IndexModifier.cpp \
--           $$CLUCENEDIR/index/IndexReader.cpp \
--           $$CLUCENEDIR/index/IndexWriter.cpp \
--           $$CLUCENEDIR/index/MultiReader.cpp \
--           $$CLUCENEDIR/index/SegmentInfos.cpp \
--           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
--           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
--           $$CLUCENEDIR/index/SegmentMerger.cpp \
--           $$CLUCENEDIR/index/SegmentReader.cpp \
--           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
--           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
--           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
--           $$CLUCENEDIR/index/SegmentTermVector.cpp \
--           $$CLUCENEDIR/index/Term.cpp \
--           $$CLUCENEDIR/index/TermInfo.cpp \
--           $$CLUCENEDIR/index/TermInfosReader.cpp \
--           $$CLUCENEDIR/index/TermInfosWriter.cpp \
--           $$CLUCENEDIR/index/TermVectorReader.cpp \
--           $$CLUCENEDIR/index/TermVectorWriter.cpp \
--           $$CLUCENEDIR/queryParser/Lexer.cpp \
--           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
--           $$CLUCENEDIR/queryParser/QueryParser.cpp \
--           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
--           $$CLUCENEDIR/queryParser/QueryToken.cpp \
--           $$CLUCENEDIR/queryParser/TokenList.cpp \
--           $$CLUCENEDIR/search/BooleanQuery.cpp \
--           $$CLUCENEDIR/search/BooleanScorer.cpp \
--           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
--           $$CLUCENEDIR/search/ChainedFilter.cpp \
--           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
--           $$CLUCENEDIR/search/DateFilter.cpp \
--           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
--           $$CLUCENEDIR/search/Explanation.cpp \
--           $$CLUCENEDIR/search/FieldCache.cpp \
--           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
--           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
--           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
--           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
--           $$CLUCENEDIR/search/FuzzyQuery.cpp \
--           $$CLUCENEDIR/search/HitQueue.cpp \
--           $$CLUCENEDIR/search/Hits.cpp \
--           $$CLUCENEDIR/search/IndexSearcher.cpp \
--           $$CLUCENEDIR/search/MultiSearcher.cpp \
--           $$CLUCENEDIR/search/MultiTermQuery.cpp \
--           $$CLUCENEDIR/search/PhrasePositions.cpp \
--           $$CLUCENEDIR/search/PhraseQuery.cpp \
--           $$CLUCENEDIR/search/PhraseScorer.cpp \
--           $$CLUCENEDIR/search/PrefixQuery.cpp \
--           $$CLUCENEDIR/search/QueryFilter.cpp \
--           $$CLUCENEDIR/search/RangeFilter.cpp \
--           $$CLUCENEDIR/search/RangeQuery.cpp \
--           $$CLUCENEDIR/search/SearchHeader.cpp \
--           $$CLUCENEDIR/search/Similarity.cpp \
--           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
--           $$CLUCENEDIR/search/Sort.cpp \
--           $$CLUCENEDIR/search/TermQuery.cpp \
--           $$CLUCENEDIR/search/TermScorer.cpp \
--           $$CLUCENEDIR/search/WildcardQuery.cpp \
--           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
--           $$CLUCENEDIR/store/FSDirectory.cpp \
--           $$CLUCENEDIR/store/IndexInput.cpp \
--           $$CLUCENEDIR/store/IndexOutput.cpp \
--           $$CLUCENEDIR/store/Lock.cpp \
--           $$CLUCENEDIR/store/MMapInput.cpp \
--           $$CLUCENEDIR/store/RAMDirectory.cpp \
--           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
--           $$CLUCENEDIR/util/BitSet.cpp \
--           $$CLUCENEDIR/util/Equators.cpp \
--           $$CLUCENEDIR/util/FastCharStream.cpp \
--           $$CLUCENEDIR/util/fileinputstream.cpp \
--           $$CLUCENEDIR/util/Misc.cpp \
--           $$CLUCENEDIR/util/Reader.cpp \
--           $$CLUCENEDIR/util/StringBuffer.cpp \
--           $$CLUCENEDIR/util/StringIntern.cpp \
--           $$CLUCENEDIR/util/ThreadLocal.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
- 
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
-+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
-+DEFINES += LUCENE_ENABLE_REFCOUNT
-+QMAKE_CXXFLAGS += -fpermissive
- 
- #Header files
- HEADERS += qclucene_global_p.h \
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.system_clucene	2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h	2014-05-30 12:31:10.922201214 -0500
-@@ -15,6 +15,8 @@
- **
- ****************************************************************************/
- 
-+#error This header must not be included when building against system CLucene.
-+
- #ifndef QCLUCENE_CONFIG_P_H
- #define QCLUCENE_CONFIG_P_H
- 
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.system_clucene	2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h	2014-05-30 12:31:10.923201233 -0500
-@@ -29,20 +29,10 @@
- // We mean it.
- //
- 
--#if !defined(_MSC_VER)
--#   include "qclucene-config_p.h"
--#endif
--
- #include <QtCore/QChar>
- #include <QtCore/QString>
- 
--#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
--#   if !defined(TCHAR)
--#       define TCHAR wchar_t
--#   endif
--#else
--#   include <qt_windows.h>
--#endif
-+#include <CLucene/StdHeader.h>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE
- #   define Q_CLUCENE_EXPORT Q_DECL_IMPORT
- #endif
- 
--//
--//  W A R N I N G
--//  -------------
--//
--// adjustments here, need to be done in
--// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
--//
--#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
--
--#elif !defined(DISABLE_NAMESPACE)
--#   ifdef QT_NAMESPACE
--#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
--#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
--
--#       define CL_NS_END }}}
--#       define CL_NS_END2 }}}}
--
--#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
--#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
--
--#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
--#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
--#   else
--#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
--#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
--
--#       define CL_NS_END }}
--#       define CL_NS_END2 }}}
--
--#       define CL_NS_USE(sub) using namespace lucene::sub;
--#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
--
--#       define CL_NS(sub) lucene::sub
--#       define CL_NS2(sub,sub2) lucene::sub::sub2
--#   endif
--#else
--#   define CL_NS_DEF(sub)
--#   define CL_NS_DEF2(sub, sub2)
--#   define CL_NS_END
--#   define CL_NS_END2
--#   define CL_NS_USE(sub)
--#   define CL_NS_USE2(sub,sub2)
--#   define CL_NS(sub)
--#   define CL_NS2(sub,sub2)
--#endif
--
- namespace QtCLuceneHelpers {
-     inline TCHAR* QStringToTChar(const QString &str)
-     {
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp	2014-05-30 12:31:10.924201251 -0500
-@@ -59,13 +59,13 @@ bool QCLuceneIndexReader::isLuceneFile(c
- {
-     using namespace lucene::index;
- 
--    return IndexReader::isLuceneFile(filename);
-+    return IndexReader::isLuceneFile(filename.toStdString().c_str());
- }
- 
- bool QCLuceneIndexReader::indexExists(const QString &directory)
- {
-     using namespace lucene::index;
--    return IndexReader::indexExists(directory);
-+    return IndexReader::indexExists(directory.toStdString().c_str());
- }
- 
- QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
-@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader:
-     using namespace lucene::index;
- 
-     QCLuceneIndexReader indexReader;
--    indexReader.d->reader = IndexReader::open(path);
-+    indexReader.d->reader = IndexReader::open(path.toStdString().c_str());
- 
-     return indexReader;
- }
-@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader:
- void QCLuceneIndexReader::unlock(const QString &path)
- {
-     using namespace lucene::index;
--    IndexReader::unlock(path);
-+    IndexReader::unlock(path.toStdString().c_str());
- }
- 
- bool QCLuceneIndexReader::isLocked(const QString &directory)
- {
-     using namespace lucene::index;
--    return IndexReader::isLocked(directory);
-+    return IndexReader::isLocked(directory.toStdString().c_str());
- }
- 
- quint64 QCLuceneIndexReader::lastModified(const QString &directory)
- {
-     using namespace lucene::index;
--    return quint64(IndexReader::lastModified(directory));
-+    return quint64(IndexReader::lastModified(directory.toStdString().c_str()));
- }
- 
- qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
- {
-     using namespace lucene::index;
--    return qint64(IndexReader::getCurrentVersion(directory));
-+    return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str()));
- }
- 
- void QCLuceneIndexReader::close()
-@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3
- void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
- {
-     TCHAR *fieldName = QStringToTChar(field);
--    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
-+    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
-     delete [] fieldName;
- }
- 
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp	2014-05-30 12:31:10.925201269 -0500
-@@ -50,7 +50,7 @@ QCLuceneIndexWriter::QCLuceneIndexWriter
-     : d(new QCLuceneIndexWriterPrivate())
-     , analyzer(analyzer)
- {
--    d->writer = new lucene::index::IndexWriter(path,
-+    d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(),
-         analyzer.d->analyzer, create, closeDir);
- }
- 
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp	2014-05-30 12:31:10.926201287 -0500
-@@ -95,7 +95,7 @@ QCLuceneIndexSearcher::QCLuceneIndexSear
-     : QCLuceneSearcher()
- {
-     lucene::search::IndexSearcher *searcher =
--        new lucene::search::IndexSearcher(path);
-+        new lucene::search::IndexSearcher(path.toStdString().c_str());
- 
-     reader.d->reader = searcher->getReader();
-     reader.d->deleteCLuceneIndexReader = false;
-diff -up qttools-opensource-src-5.3.0/src/assistant/help/help.pro.system_clucene qttools-opensource-src-5.3.0/src/assistant/help/help.pro
---- qttools-opensource-src-5.3.0/src/assistant/help/help.pro.system_clucene	2014-05-15 12:12:40.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/help/help.pro	2014-05-30 12:50:57.233287205 -0500
-@@ -34,6 +34,7 @@ SOURCES += qhelpenginecore.cpp \
-     qhelp_global.cpp
- 
- # access to clucene
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
- SOURCES += qhelpsearchindexwriter_clucene.cpp \
-     qhelpsearchindexreader_clucene.cpp
- HEADERS += qhelpenginecore.h \
diff --git a/qttools-opensource-src-5.3.2-system-clucene.patch b/qttools-opensource-src-5.3.2-system-clucene.patch
new file mode 100644
index 0000000..5a358f5
--- /dev/null
+++ b/qttools-opensource-src-5.3.2-system-clucene.patch
@@ -0,0 +1,351 @@
+diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri
+--- qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri	2014-09-11 12:48:25.000000000 +0200
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri	2014-10-31 23:44:32.368856494 +0100
+@@ -1,125 +1,7 @@
+-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
+-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
+-
+-CLUCENEDIR = ../3rdparty/clucene/src/CLucene
+-
+-INCLUDEPATH += . .. \
+-               $$CLUCENEDIR \
+-               $$CLUCENEDIR/../ \
+-               $$CLUCENEDIR/analysis \
+-               $$CLUCENEDIR/analysis/standard \
+-               $$CLUCENEDIR/config \
+-               $$CLUCENEDIR/debug \
+-               $$CLUCENEDIR/document \
+-               $$CLUCENEDIR/index \
+-               $$CLUCENEDIR/queryParser \
+-               $$CLUCENEDIR/search \
+-               $$CLUCENEDIR/store \
+-               $$CLUCENEDIR/util
+-
+-
+-SOURCES += $$CLUCENEDIR/StdHeader.cpp \
+-           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
+-           $$CLUCENEDIR/analysis/Analyzers.cpp \
+-           $$CLUCENEDIR/config/gunichartables.cpp \
+-           $$CLUCENEDIR/config/repl_lltot.cpp \
+-           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
+-           $$CLUCENEDIR/config/repl_tcslwr.cpp \
+-           $$CLUCENEDIR/config/repl_tcstod.cpp \
+-           $$CLUCENEDIR/config/repl_tcstoll.cpp \
+-           $$CLUCENEDIR/config/repl_tprintf.cpp \
+-           $$CLUCENEDIR/config/threads.cpp \
+-           $$CLUCENEDIR/config/utf8.cpp \
+-           $$CLUCENEDIR/debug/condition.cpp \
+-           $$CLUCENEDIR/debug/error.cpp \
+-           $$CLUCENEDIR/debug/memtracking.cpp \
+-           $$CLUCENEDIR/document/DateField.cpp \
+-           $$CLUCENEDIR/document/Document.cpp \
+-           $$CLUCENEDIR/document/Field.cpp \
+-           $$CLUCENEDIR/index/CompoundFile.cpp \
+-           $$CLUCENEDIR/index/DocumentWriter.cpp \
+-           $$CLUCENEDIR/index/FieldInfos.cpp \
+-           $$CLUCENEDIR/index/FieldsReader.cpp \
+-           $$CLUCENEDIR/index/FieldsWriter.cpp \
+-           $$CLUCENEDIR/index/IndexModifier.cpp \
+-           $$CLUCENEDIR/index/IndexReader.cpp \
+-           $$CLUCENEDIR/index/IndexWriter.cpp \
+-           $$CLUCENEDIR/index/MultiReader.cpp \
+-           $$CLUCENEDIR/index/SegmentInfos.cpp \
+-           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
+-           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
+-           $$CLUCENEDIR/index/SegmentMerger.cpp \
+-           $$CLUCENEDIR/index/SegmentReader.cpp \
+-           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
+-           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
+-           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
+-           $$CLUCENEDIR/index/SegmentTermVector.cpp \
+-           $$CLUCENEDIR/index/Term.cpp \
+-           $$CLUCENEDIR/index/TermInfo.cpp \
+-           $$CLUCENEDIR/index/TermInfosReader.cpp \
+-           $$CLUCENEDIR/index/TermInfosWriter.cpp \
+-           $$CLUCENEDIR/index/TermVectorReader.cpp \
+-           $$CLUCENEDIR/index/TermVectorWriter.cpp \
+-           $$CLUCENEDIR/queryParser/Lexer.cpp \
+-           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
+-           $$CLUCENEDIR/queryParser/QueryParser.cpp \
+-           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
+-           $$CLUCENEDIR/queryParser/QueryToken.cpp \
+-           $$CLUCENEDIR/queryParser/TokenList.cpp \
+-           $$CLUCENEDIR/search/BooleanQuery.cpp \
+-           $$CLUCENEDIR/search/BooleanScorer.cpp \
+-           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
+-           $$CLUCENEDIR/search/ChainedFilter.cpp \
+-           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
+-           $$CLUCENEDIR/search/DateFilter.cpp \
+-           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
+-           $$CLUCENEDIR/search/Explanation.cpp \
+-           $$CLUCENEDIR/search/FieldCache.cpp \
+-           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
+-           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
+-           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
+-           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
+-           $$CLUCENEDIR/search/FuzzyQuery.cpp \
+-           $$CLUCENEDIR/search/HitQueue.cpp \
+-           $$CLUCENEDIR/search/Hits.cpp \
+-           $$CLUCENEDIR/search/IndexSearcher.cpp \
+-           $$CLUCENEDIR/search/MultiSearcher.cpp \
+-           $$CLUCENEDIR/search/MultiTermQuery.cpp \
+-           $$CLUCENEDIR/search/PhrasePositions.cpp \
+-           $$CLUCENEDIR/search/PhraseQuery.cpp \
+-           $$CLUCENEDIR/search/PhraseScorer.cpp \
+-           $$CLUCENEDIR/search/PrefixQuery.cpp \
+-           $$CLUCENEDIR/search/QueryFilter.cpp \
+-           $$CLUCENEDIR/search/RangeFilter.cpp \
+-           $$CLUCENEDIR/search/RangeQuery.cpp \
+-           $$CLUCENEDIR/search/SearchHeader.cpp \
+-           $$CLUCENEDIR/search/Similarity.cpp \
+-           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
+-           $$CLUCENEDIR/search/Sort.cpp \
+-           $$CLUCENEDIR/search/TermQuery.cpp \
+-           $$CLUCENEDIR/search/TermScorer.cpp \
+-           $$CLUCENEDIR/search/WildcardQuery.cpp \
+-           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
+-           $$CLUCENEDIR/store/FSDirectory.cpp \
+-           $$CLUCENEDIR/store/IndexInput.cpp \
+-           $$CLUCENEDIR/store/IndexOutput.cpp \
+-           $$CLUCENEDIR/store/Lock.cpp \
+-           $$CLUCENEDIR/store/MMapInput.cpp \
+-           $$CLUCENEDIR/store/RAMDirectory.cpp \
+-           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
+-           $$CLUCENEDIR/util/BitSet.cpp \
+-           $$CLUCENEDIR/util/Equators.cpp \
+-           $$CLUCENEDIR/util/FastCharStream.cpp \
+-           $$CLUCENEDIR/util/fileinputstream.cpp \
+-           $$CLUCENEDIR/util/Misc.cpp \
+-           $$CLUCENEDIR/util/Reader.cpp \
+-           $$CLUCENEDIR/util/StringBuffer.cpp \
+-           $$CLUCENEDIR/util/StringIntern.cpp \
+-           $$CLUCENEDIR/util/ThreadLocal.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
+ 
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
++LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
++#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
+ 
+ #Header files
+ HEADERS += qclucene_global_p.h \
+diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h
+--- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h	2014-09-11 12:48:25.000000000 +0200
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h	2014-10-31 23:44:32.368856494 +0100
+@@ -15,6 +15,8 @@
+ **
+ ****************************************************************************/
+ 
++#error This header must not be included when building against system CLucene.
++
+ #ifndef QCLUCENE_CONFIG_P_H
+ #define QCLUCENE_CONFIG_P_H
+ 
+diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h
+--- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h	2014-09-11 12:48:25.000000000 +0200
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h	2014-10-31 23:44:32.368856494 +0100
+@@ -29,20 +29,10 @@
+ // We mean it.
+ //
+ 
+-#if !defined(_MSC_VER)
+-#   include "qclucene-config_p.h"
+-#endif
+-
+ #include <QtCore/QChar>
+ #include <QtCore/QString>
+ 
+-#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+-#   if !defined(TCHAR)
+-#       define TCHAR wchar_t
+-#   endif
+-#else
+-#   include <qt_windows.h>
+-#endif
++#include <CLucene/StdHeader.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -54,52 +44,6 @@
+ #   define Q_CLUCENE_EXPORT Q_DECL_IMPORT
+ #endif
+ 
+-//
+-//  W A R N I N G
+-//  -------------
+-//
+-// adjustments here, need to be done in
+-// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
+-//
+-#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
+-
+-#elif !defined(DISABLE_NAMESPACE)
+-#   ifdef QT_NAMESPACE
+-#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
+-#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
+-
+-#       define CL_NS_END }}}
+-#       define CL_NS_END2 }}}}
+-
+-#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
+-#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
+-
+-#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
+-#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
+-#   else
+-#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
+-#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
+-
+-#       define CL_NS_END }}
+-#       define CL_NS_END2 }}}
+-
+-#       define CL_NS_USE(sub) using namespace lucene::sub;
+-#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
+-
+-#       define CL_NS(sub) lucene::sub
+-#       define CL_NS2(sub,sub2) lucene::sub::sub2
+-#   endif
+-#else
+-#   define CL_NS_DEF(sub)
+-#   define CL_NS_DEF2(sub, sub2)
+-#   define CL_NS_END
+-#   define CL_NS_END2
+-#   define CL_NS_USE(sub)
+-#   define CL_NS_USE2(sub,sub2)
+-#   define CL_NS(sub)
+-#   define CL_NS2(sub,sub2)
+-#endif
+-
+ namespace QtCLuceneHelpers {
+     inline TCHAR* QStringToTChar(const QString &str)
+     {
+diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp
+--- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp	2014-09-11 12:48:25.000000000 +0200
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp	2014-10-31 23:47:52.184907583 +0100
+@@ -18,6 +18,8 @@
+ #include "qindexreader_p.h"
+ #include "qclucene_global_p.h"
+ 
++#include <QtCore/QDir>
++
+ #include <CLucene.h>
+ #include <CLucene/index/IndexReader.h>
+ 
+@@ -59,13 +61,13 @@
+ {
+     using namespace lucene::index;
+ 
+-    return IndexReader::isLuceneFile(filename);
++    return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
+ }
+ 
+ bool QCLuceneIndexReader::indexExists(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return IndexReader::indexExists(directory);
++    return IndexReader::indexExists(directory.toLocal8Bit().constData());
+ }
+ 
+ QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
+@@ -73,7 +75,7 @@
+     using namespace lucene::index;
+ 
+     QCLuceneIndexReader indexReader;
+-    indexReader.d->reader = IndexReader::open(path);
++    indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
+ 
+     return indexReader;
+ }
+@@ -81,25 +83,29 @@
+ void QCLuceneIndexReader::unlock(const QString &path)
+ {
+     using namespace lucene::index;
+-    IndexReader::unlock(path);
++    IndexReader::unlock(path.toLocal8Bit().constData());
+ }
+ 
+ bool QCLuceneIndexReader::isLocked(const QString &directory)
+ {
++    // The system CLucene fails here if the directory does not exist yet, unlike
++    // the bundled one. Work around that.
++    QDir::current().mkpath(directory);
++
+     using namespace lucene::index;
+-    return IndexReader::isLocked(directory);
++    return IndexReader::isLocked(directory.toLocal8Bit().constData());
+ }
+ 
+ quint64 QCLuceneIndexReader::lastModified(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return quint64(IndexReader::lastModified(directory));
++    return quint64(IndexReader::lastModified(directory.toLocal8Bit().constData()));
+ }
+ 
+ qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return qint64(IndexReader::getCurrentVersion(directory));
++    return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
+ }
+ 
+ void QCLuceneIndexReader::close()
+@@ -155,7 +161,7 @@
+ void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
+ {
+     TCHAR *fieldName = QStringToTChar(field);
+-    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
++    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
+     delete [] fieldName;
+ }
+ 
+diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp
+--- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp	2014-09-11 12:48:25.000000000 +0200
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp	2014-10-31 23:44:32.369856502 +0100
+@@ -18,6 +18,8 @@
+ #include "qindexwriter_p.h"
+ #include "qindexreader_p.h"
+ 
++#include <QtCore/QDir>
++
+ #include <CLucene.h>
+ #include <CLucene/index/IndexWriter.h>
+ 
+@@ -50,7 +52,12 @@
+     : d(new QCLuceneIndexWriterPrivate())
+     , analyzer(analyzer)
+ {
+-    d->writer = new lucene::index::IndexWriter(path,
++    // The system CLucene cannot create directories recursively, so do it here.
++    // Ignore failure: If it failed, we will get an error from CLucene anyway.
++    if (create)
++        QDir::current().mkpath(path);
++
++    d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(),
+         analyzer.d->analyzer, create, closeDir);
+ }
+ 
+diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp
+--- qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp	2014-09-11 12:48:25.000000000 +0200
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp	2014-10-31 23:44:32.369856502 +0100
+@@ -95,7 +95,7 @@
+     : QCLuceneSearcher()
+ {
+     lucene::search::IndexSearcher *searcher =
+-        new lucene::search::IndexSearcher(path);
++        new lucene::search::IndexSearcher(path.toLocal8Bit().constData());
+ 
+     reader.d->reader = searcher->getReader();
+     reader.d->deleteCLuceneIndexReader = false;
+diff -ur qttools-opensource-src-5.3.2/src/assistant/help/help.pro qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro
+--- qttools-opensource-src-5.3.2/src/assistant/help/help.pro	2014-09-11 12:48:25.000000000 +0200
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro	2014-10-31 23:44:32.369856502 +0100
+@@ -34,6 +34,7 @@
+     qhelp_global.cpp
+ 
+ # access to clucene
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
+ SOURCES += qhelpsearchindexwriter_clucene.cpp \
+     qhelpsearchindexreader_clucene.cpp
+ HEADERS += qhelpenginecore.h \
-- 
cgit v0.10.2


>From e00896d6b411e8cac2301cadd9d4c046258368f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Tue, 9 Dec 2014 15:48:01 +0100
Subject: Fix qdbusviewer-qt5 icon


diff --git a/qdbusviewer.desktop b/qdbusviewer.desktop
index d6e0f0a..188da47 100644
--- a/qdbusviewer.desktop
+++ b/qdbusviewer.desktop
@@ -3,7 +3,7 @@ Name=Qt5 QDbusViewer
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
 Exec=qdbusviewer-qt5
-Icon=qt5-qdbusviewer
+Icon=qdbusviewer-qt5
 Terminal=false
 Type=Application
 Categories=Qt;Development;Debugger;
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 0ce986a..ec25ce5 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -14,7 +14,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -355,6 +355,9 @@ fi
 
 
 %changelog
+* Tue Dec 09 2014 Daniel Vrátil <dvratil at redhat.com> 5.3.2-5
+- fix icon name in qdbusviewer-qt5.desktop
+
 * Thu Dec 04 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.3.2-4
 - system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups
 - F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293)
-- 
cgit v0.10.2


>From 1722cb8b8569232018ae983ec4530a7fe797d3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Tue, 9 Dec 2014 15:48:01 +0100
Subject: Fix qdbusviewer-qt5 icon


diff --git a/qdbusviewer.desktop b/qdbusviewer.desktop
index d6e0f0a..188da47 100644
--- a/qdbusviewer.desktop
+++ b/qdbusviewer.desktop
@@ -3,7 +3,7 @@ Name=Qt5 QDbusViewer
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
 Exec=qdbusviewer-qt5
-Icon=qt5-qdbusviewer
+Icon=qdbusviewer-qt5
 Terminal=false
 Type=Application
 Categories=Qt;Development;Debugger;
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 0ce986a..ec25ce5 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -14,7 +14,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -355,6 +355,9 @@ fi
 
 
 %changelog
+* Tue Dec 09 2014 Daniel Vrátil <dvratil at redhat.com> 5.3.2-5
+- fix icon name in qdbusviewer-qt5.desktop
+
 * Thu Dec 04 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.3.2-4
 - system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups
 - F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293)
-- 
cgit v0.10.2


>From 60aa6d57a17d635400a0d787b869e97117c18523 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:48:54 -0600
Subject: Revert "Fix qdbusviewer-qt5 icon"

This reverts commit e00896d6b411e8cac2301cadd9d4c046258368f2.

diff --git a/qdbusviewer.desktop b/qdbusviewer.desktop
index 188da47..d6e0f0a 100644
--- a/qdbusviewer.desktop
+++ b/qdbusviewer.desktop
@@ -3,7 +3,7 @@ Name=Qt5 QDbusViewer
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
 Exec=qdbusviewer-qt5
-Icon=qdbusviewer-qt5
+Icon=qt5-qdbusviewer
 Terminal=false
 Type=Application
 Categories=Qt;Development;Debugger;
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index ec25ce5..0ce986a 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -14,7 +14,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 5%{?dist}
+Release: 4%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -355,9 +355,6 @@ fi
 
 
 %changelog
-* Tue Dec 09 2014 Daniel Vrátil <dvratil at redhat.com> 5.3.2-5
-- fix icon name in qdbusviewer-qt5.desktop
-
 * Thu Dec 04 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.3.2-4
 - system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups
 - F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293)
-- 
cgit v0.10.2


>From 4842e30fa00d28bd42ce1a65f8a6b28fc643745a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:48:56 -0600
Subject: Revert "system-clucene patch fixes: some required QDir::mkpath in
 QtCLucene, cleanups"

This reverts commit aab042cb30276d58e2348f6a5e6addb390b0fafa.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 0ce986a..cf6bc67 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,8 +1,6 @@
 
 %global qt_module qttools
-%if 0%{?fedora} > 19 || 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 +12,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 4%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -25,7 +23,7 @@ Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%
 Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 %endif
 
-Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
+Patch1: qttools-opensource-src-5.3.0-system-clucene.patch
 
 # help lrelease/lupdate use/prefer qmake-qt5
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
@@ -49,7 +47,12 @@ BuildRequires: qt5-qtdeclarative-static
 BuildRequires: qt5-qtwebkit-devel
 
 %if 0%{?system_clucene}
-BuildRequires: clucene09-core-devel >= 0.9.21b-12
+%if 0%{?fedora} || 0%{?rhel} > 6
+BuildRequires: clucene09-core-devel
+%else
+BuildConflicts: clucene-core-devel > 2
+BuildRequires: clucene-core-devel
+%endif
 %endif
 
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -355,11 +358,6 @@ fi
 
 
 %changelog
-* Thu Dec 04 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.3.2-4
-- system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups
-- F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293)
-- disable system-clucene where refcounted clucene09 not available (#1128293)
-
 * Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
 - rebuild (clucene09)
 
diff --git a/qttools-opensource-src-5.3.0-system-clucene.patch b/qttools-opensource-src-5.3.0-system-clucene.patch
new file mode 100644
index 0000000..21fd880
--- /dev/null
+++ b/qttools-opensource-src-5.3.0-system-clucene.patch
@@ -0,0 +1,325 @@
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri	2014-05-30 12:31:10.921201196 -0500
+@@ -1,125 +1,8 @@
+-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
+-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
+-
+-CLUCENEDIR = ../3rdparty/clucene/src/CLucene
+-
+-INCLUDEPATH += . .. \
+-               $$CLUCENEDIR \
+-               $$CLUCENEDIR/../ \
+-               $$CLUCENEDIR/analysis \
+-               $$CLUCENEDIR/analysis/standard \
+-               $$CLUCENEDIR/config \
+-               $$CLUCENEDIR/debug \
+-               $$CLUCENEDIR/document \
+-               $$CLUCENEDIR/index \
+-               $$CLUCENEDIR/queryParser \
+-               $$CLUCENEDIR/search \
+-               $$CLUCENEDIR/store \
+-               $$CLUCENEDIR/util
+-
+-
+-SOURCES += $$CLUCENEDIR/StdHeader.cpp \
+-           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
+-           $$CLUCENEDIR/analysis/Analyzers.cpp \
+-           $$CLUCENEDIR/config/gunichartables.cpp \
+-           $$CLUCENEDIR/config/repl_lltot.cpp \
+-           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
+-           $$CLUCENEDIR/config/repl_tcslwr.cpp \
+-           $$CLUCENEDIR/config/repl_tcstod.cpp \
+-           $$CLUCENEDIR/config/repl_tcstoll.cpp \
+-           $$CLUCENEDIR/config/repl_tprintf.cpp \
+-           $$CLUCENEDIR/config/threads.cpp \
+-           $$CLUCENEDIR/config/utf8.cpp \
+-           $$CLUCENEDIR/debug/condition.cpp \
+-           $$CLUCENEDIR/debug/error.cpp \
+-           $$CLUCENEDIR/debug/memtracking.cpp \
+-           $$CLUCENEDIR/document/DateField.cpp \
+-           $$CLUCENEDIR/document/Document.cpp \
+-           $$CLUCENEDIR/document/Field.cpp \
+-           $$CLUCENEDIR/index/CompoundFile.cpp \
+-           $$CLUCENEDIR/index/DocumentWriter.cpp \
+-           $$CLUCENEDIR/index/FieldInfos.cpp \
+-           $$CLUCENEDIR/index/FieldsReader.cpp \
+-           $$CLUCENEDIR/index/FieldsWriter.cpp \
+-           $$CLUCENEDIR/index/IndexModifier.cpp \
+-           $$CLUCENEDIR/index/IndexReader.cpp \
+-           $$CLUCENEDIR/index/IndexWriter.cpp \
+-           $$CLUCENEDIR/index/MultiReader.cpp \
+-           $$CLUCENEDIR/index/SegmentInfos.cpp \
+-           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
+-           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
+-           $$CLUCENEDIR/index/SegmentMerger.cpp \
+-           $$CLUCENEDIR/index/SegmentReader.cpp \
+-           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
+-           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
+-           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
+-           $$CLUCENEDIR/index/SegmentTermVector.cpp \
+-           $$CLUCENEDIR/index/Term.cpp \
+-           $$CLUCENEDIR/index/TermInfo.cpp \
+-           $$CLUCENEDIR/index/TermInfosReader.cpp \
+-           $$CLUCENEDIR/index/TermInfosWriter.cpp \
+-           $$CLUCENEDIR/index/TermVectorReader.cpp \
+-           $$CLUCENEDIR/index/TermVectorWriter.cpp \
+-           $$CLUCENEDIR/queryParser/Lexer.cpp \
+-           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
+-           $$CLUCENEDIR/queryParser/QueryParser.cpp \
+-           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
+-           $$CLUCENEDIR/queryParser/QueryToken.cpp \
+-           $$CLUCENEDIR/queryParser/TokenList.cpp \
+-           $$CLUCENEDIR/search/BooleanQuery.cpp \
+-           $$CLUCENEDIR/search/BooleanScorer.cpp \
+-           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
+-           $$CLUCENEDIR/search/ChainedFilter.cpp \
+-           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
+-           $$CLUCENEDIR/search/DateFilter.cpp \
+-           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
+-           $$CLUCENEDIR/search/Explanation.cpp \
+-           $$CLUCENEDIR/search/FieldCache.cpp \
+-           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
+-           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
+-           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
+-           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
+-           $$CLUCENEDIR/search/FuzzyQuery.cpp \
+-           $$CLUCENEDIR/search/HitQueue.cpp \
+-           $$CLUCENEDIR/search/Hits.cpp \
+-           $$CLUCENEDIR/search/IndexSearcher.cpp \
+-           $$CLUCENEDIR/search/MultiSearcher.cpp \
+-           $$CLUCENEDIR/search/MultiTermQuery.cpp \
+-           $$CLUCENEDIR/search/PhrasePositions.cpp \
+-           $$CLUCENEDIR/search/PhraseQuery.cpp \
+-           $$CLUCENEDIR/search/PhraseScorer.cpp \
+-           $$CLUCENEDIR/search/PrefixQuery.cpp \
+-           $$CLUCENEDIR/search/QueryFilter.cpp \
+-           $$CLUCENEDIR/search/RangeFilter.cpp \
+-           $$CLUCENEDIR/search/RangeQuery.cpp \
+-           $$CLUCENEDIR/search/SearchHeader.cpp \
+-           $$CLUCENEDIR/search/Similarity.cpp \
+-           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
+-           $$CLUCENEDIR/search/Sort.cpp \
+-           $$CLUCENEDIR/search/TermQuery.cpp \
+-           $$CLUCENEDIR/search/TermScorer.cpp \
+-           $$CLUCENEDIR/search/WildcardQuery.cpp \
+-           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
+-           $$CLUCENEDIR/store/FSDirectory.cpp \
+-           $$CLUCENEDIR/store/IndexInput.cpp \
+-           $$CLUCENEDIR/store/IndexOutput.cpp \
+-           $$CLUCENEDIR/store/Lock.cpp \
+-           $$CLUCENEDIR/store/MMapInput.cpp \
+-           $$CLUCENEDIR/store/RAMDirectory.cpp \
+-           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
+-           $$CLUCENEDIR/util/BitSet.cpp \
+-           $$CLUCENEDIR/util/Equators.cpp \
+-           $$CLUCENEDIR/util/FastCharStream.cpp \
+-           $$CLUCENEDIR/util/fileinputstream.cpp \
+-           $$CLUCENEDIR/util/Misc.cpp \
+-           $$CLUCENEDIR/util/Reader.cpp \
+-           $$CLUCENEDIR/util/StringBuffer.cpp \
+-           $$CLUCENEDIR/util/StringIntern.cpp \
+-           $$CLUCENEDIR/util/ThreadLocal.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
+ 
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
++LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
++DEFINES += LUCENE_ENABLE_REFCOUNT
++QMAKE_CXXFLAGS += -fpermissive
+ 
+ #Header files
+ HEADERS += qclucene_global_p.h \
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h	2014-05-30 12:31:10.922201214 -0500
+@@ -15,6 +15,8 @@
+ **
+ ****************************************************************************/
+ 
++#error This header must not be included when building against system CLucene.
++
+ #ifndef QCLUCENE_CONFIG_P_H
+ #define QCLUCENE_CONFIG_P_H
+ 
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h	2014-05-30 12:31:10.923201233 -0500
+@@ -29,20 +29,10 @@
+ // We mean it.
+ //
+ 
+-#if !defined(_MSC_VER)
+-#   include "qclucene-config_p.h"
+-#endif
+-
+ #include <QtCore/QChar>
+ #include <QtCore/QString>
+ 
+-#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+-#   if !defined(TCHAR)
+-#       define TCHAR wchar_t
+-#   endif
+-#else
+-#   include <qt_windows.h>
+-#endif
++#include <CLucene/StdHeader.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE
+ #   define Q_CLUCENE_EXPORT Q_DECL_IMPORT
+ #endif
+ 
+-//
+-//  W A R N I N G
+-//  -------------
+-//
+-// adjustments here, need to be done in
+-// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
+-//
+-#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
+-
+-#elif !defined(DISABLE_NAMESPACE)
+-#   ifdef QT_NAMESPACE
+-#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
+-#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
+-
+-#       define CL_NS_END }}}
+-#       define CL_NS_END2 }}}}
+-
+-#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
+-#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
+-
+-#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
+-#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
+-#   else
+-#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
+-#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
+-
+-#       define CL_NS_END }}
+-#       define CL_NS_END2 }}}
+-
+-#       define CL_NS_USE(sub) using namespace lucene::sub;
+-#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
+-
+-#       define CL_NS(sub) lucene::sub
+-#       define CL_NS2(sub,sub2) lucene::sub::sub2
+-#   endif
+-#else
+-#   define CL_NS_DEF(sub)
+-#   define CL_NS_DEF2(sub, sub2)
+-#   define CL_NS_END
+-#   define CL_NS_END2
+-#   define CL_NS_USE(sub)
+-#   define CL_NS_USE2(sub,sub2)
+-#   define CL_NS(sub)
+-#   define CL_NS2(sub,sub2)
+-#endif
+-
+ namespace QtCLuceneHelpers {
+     inline TCHAR* QStringToTChar(const QString &str)
+     {
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp	2014-05-30 12:31:10.924201251 -0500
+@@ -59,13 +59,13 @@ bool QCLuceneIndexReader::isLuceneFile(c
+ {
+     using namespace lucene::index;
+ 
+-    return IndexReader::isLuceneFile(filename);
++    return IndexReader::isLuceneFile(filename.toStdString().c_str());
+ }
+ 
+ bool QCLuceneIndexReader::indexExists(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return IndexReader::indexExists(directory);
++    return IndexReader::indexExists(directory.toStdString().c_str());
+ }
+ 
+ QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
+@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader:
+     using namespace lucene::index;
+ 
+     QCLuceneIndexReader indexReader;
+-    indexReader.d->reader = IndexReader::open(path);
++    indexReader.d->reader = IndexReader::open(path.toStdString().c_str());
+ 
+     return indexReader;
+ }
+@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader:
+ void QCLuceneIndexReader::unlock(const QString &path)
+ {
+     using namespace lucene::index;
+-    IndexReader::unlock(path);
++    IndexReader::unlock(path.toStdString().c_str());
+ }
+ 
+ bool QCLuceneIndexReader::isLocked(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return IndexReader::isLocked(directory);
++    return IndexReader::isLocked(directory.toStdString().c_str());
+ }
+ 
+ quint64 QCLuceneIndexReader::lastModified(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return quint64(IndexReader::lastModified(directory));
++    return quint64(IndexReader::lastModified(directory.toStdString().c_str()));
+ }
+ 
+ qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return qint64(IndexReader::getCurrentVersion(directory));
++    return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str()));
+ }
+ 
+ void QCLuceneIndexReader::close()
+@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3
+ void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
+ {
+     TCHAR *fieldName = QStringToTChar(field);
+-    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
++    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
+     delete [] fieldName;
+ }
+ 
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp	2014-05-30 12:31:10.925201269 -0500
+@@ -50,7 +50,7 @@ QCLuceneIndexWriter::QCLuceneIndexWriter
+     : d(new QCLuceneIndexWriterPrivate())
+     , analyzer(analyzer)
+ {
+-    d->writer = new lucene::index::IndexWriter(path,
++    d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(),
+         analyzer.d->analyzer, create, closeDir);
+ }
+ 
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp	2014-05-30 12:31:10.926201287 -0500
+@@ -95,7 +95,7 @@ QCLuceneIndexSearcher::QCLuceneIndexSear
+     : QCLuceneSearcher()
+ {
+     lucene::search::IndexSearcher *searcher =
+-        new lucene::search::IndexSearcher(path);
++        new lucene::search::IndexSearcher(path.toStdString().c_str());
+ 
+     reader.d->reader = searcher->getReader();
+     reader.d->deleteCLuceneIndexReader = false;
+diff -up qttools-opensource-src-5.3.0/src/assistant/help/help.pro.system_clucene qttools-opensource-src-5.3.0/src/assistant/help/help.pro
+--- qttools-opensource-src-5.3.0/src/assistant/help/help.pro.system_clucene	2014-05-15 12:12:40.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/help/help.pro	2014-05-30 12:50:57.233287205 -0500
+@@ -34,6 +34,7 @@ SOURCES += qhelpenginecore.cpp \
+     qhelp_global.cpp
+ 
+ # access to clucene
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
+ SOURCES += qhelpsearchindexwriter_clucene.cpp \
+     qhelpsearchindexreader_clucene.cpp
+ HEADERS += qhelpenginecore.h \
diff --git a/qttools-opensource-src-5.3.2-system-clucene.patch b/qttools-opensource-src-5.3.2-system-clucene.patch
deleted file mode 100644
index 5a358f5..0000000
--- a/qttools-opensource-src-5.3.2-system-clucene.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri
---- qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri	2014-10-31 23:44:32.368856494 +0100
-@@ -1,125 +1,7 @@
--DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
--win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
--
--CLUCENEDIR = ../3rdparty/clucene/src/CLucene
--
--INCLUDEPATH += . .. \
--               $$CLUCENEDIR \
--               $$CLUCENEDIR/../ \
--               $$CLUCENEDIR/analysis \
--               $$CLUCENEDIR/analysis/standard \
--               $$CLUCENEDIR/config \
--               $$CLUCENEDIR/debug \
--               $$CLUCENEDIR/document \
--               $$CLUCENEDIR/index \
--               $$CLUCENEDIR/queryParser \
--               $$CLUCENEDIR/search \
--               $$CLUCENEDIR/store \
--               $$CLUCENEDIR/util
--
--
--SOURCES += $$CLUCENEDIR/StdHeader.cpp \
--           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
--           $$CLUCENEDIR/analysis/Analyzers.cpp \
--           $$CLUCENEDIR/config/gunichartables.cpp \
--           $$CLUCENEDIR/config/repl_lltot.cpp \
--           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
--           $$CLUCENEDIR/config/repl_tcslwr.cpp \
--           $$CLUCENEDIR/config/repl_tcstod.cpp \
--           $$CLUCENEDIR/config/repl_tcstoll.cpp \
--           $$CLUCENEDIR/config/repl_tprintf.cpp \
--           $$CLUCENEDIR/config/threads.cpp \
--           $$CLUCENEDIR/config/utf8.cpp \
--           $$CLUCENEDIR/debug/condition.cpp \
--           $$CLUCENEDIR/debug/error.cpp \
--           $$CLUCENEDIR/debug/memtracking.cpp \
--           $$CLUCENEDIR/document/DateField.cpp \
--           $$CLUCENEDIR/document/Document.cpp \
--           $$CLUCENEDIR/document/Field.cpp \
--           $$CLUCENEDIR/index/CompoundFile.cpp \
--           $$CLUCENEDIR/index/DocumentWriter.cpp \
--           $$CLUCENEDIR/index/FieldInfos.cpp \
--           $$CLUCENEDIR/index/FieldsReader.cpp \
--           $$CLUCENEDIR/index/FieldsWriter.cpp \
--           $$CLUCENEDIR/index/IndexModifier.cpp \
--           $$CLUCENEDIR/index/IndexReader.cpp \
--           $$CLUCENEDIR/index/IndexWriter.cpp \
--           $$CLUCENEDIR/index/MultiReader.cpp \
--           $$CLUCENEDIR/index/SegmentInfos.cpp \
--           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
--           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
--           $$CLUCENEDIR/index/SegmentMerger.cpp \
--           $$CLUCENEDIR/index/SegmentReader.cpp \
--           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
--           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
--           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
--           $$CLUCENEDIR/index/SegmentTermVector.cpp \
--           $$CLUCENEDIR/index/Term.cpp \
--           $$CLUCENEDIR/index/TermInfo.cpp \
--           $$CLUCENEDIR/index/TermInfosReader.cpp \
--           $$CLUCENEDIR/index/TermInfosWriter.cpp \
--           $$CLUCENEDIR/index/TermVectorReader.cpp \
--           $$CLUCENEDIR/index/TermVectorWriter.cpp \
--           $$CLUCENEDIR/queryParser/Lexer.cpp \
--           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
--           $$CLUCENEDIR/queryParser/QueryParser.cpp \
--           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
--           $$CLUCENEDIR/queryParser/QueryToken.cpp \
--           $$CLUCENEDIR/queryParser/TokenList.cpp \
--           $$CLUCENEDIR/search/BooleanQuery.cpp \
--           $$CLUCENEDIR/search/BooleanScorer.cpp \
--           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
--           $$CLUCENEDIR/search/ChainedFilter.cpp \
--           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
--           $$CLUCENEDIR/search/DateFilter.cpp \
--           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
--           $$CLUCENEDIR/search/Explanation.cpp \
--           $$CLUCENEDIR/search/FieldCache.cpp \
--           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
--           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
--           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
--           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
--           $$CLUCENEDIR/search/FuzzyQuery.cpp \
--           $$CLUCENEDIR/search/HitQueue.cpp \
--           $$CLUCENEDIR/search/Hits.cpp \
--           $$CLUCENEDIR/search/IndexSearcher.cpp \
--           $$CLUCENEDIR/search/MultiSearcher.cpp \
--           $$CLUCENEDIR/search/MultiTermQuery.cpp \
--           $$CLUCENEDIR/search/PhrasePositions.cpp \
--           $$CLUCENEDIR/search/PhraseQuery.cpp \
--           $$CLUCENEDIR/search/PhraseScorer.cpp \
--           $$CLUCENEDIR/search/PrefixQuery.cpp \
--           $$CLUCENEDIR/search/QueryFilter.cpp \
--           $$CLUCENEDIR/search/RangeFilter.cpp \
--           $$CLUCENEDIR/search/RangeQuery.cpp \
--           $$CLUCENEDIR/search/SearchHeader.cpp \
--           $$CLUCENEDIR/search/Similarity.cpp \
--           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
--           $$CLUCENEDIR/search/Sort.cpp \
--           $$CLUCENEDIR/search/TermQuery.cpp \
--           $$CLUCENEDIR/search/TermScorer.cpp \
--           $$CLUCENEDIR/search/WildcardQuery.cpp \
--           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
--           $$CLUCENEDIR/store/FSDirectory.cpp \
--           $$CLUCENEDIR/store/IndexInput.cpp \
--           $$CLUCENEDIR/store/IndexOutput.cpp \
--           $$CLUCENEDIR/store/Lock.cpp \
--           $$CLUCENEDIR/store/MMapInput.cpp \
--           $$CLUCENEDIR/store/RAMDirectory.cpp \
--           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
--           $$CLUCENEDIR/util/BitSet.cpp \
--           $$CLUCENEDIR/util/Equators.cpp \
--           $$CLUCENEDIR/util/FastCharStream.cpp \
--           $$CLUCENEDIR/util/fileinputstream.cpp \
--           $$CLUCENEDIR/util/Misc.cpp \
--           $$CLUCENEDIR/util/Reader.cpp \
--           $$CLUCENEDIR/util/StringBuffer.cpp \
--           $$CLUCENEDIR/util/StringIntern.cpp \
--           $$CLUCENEDIR/util/ThreadLocal.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
- 
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
-+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
-+#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
- 
- #Header files
- HEADERS += qclucene_global_p.h \
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h	2014-10-31 23:44:32.368856494 +0100
-@@ -15,6 +15,8 @@
- **
- ****************************************************************************/
- 
-+#error This header must not be included when building against system CLucene.
-+
- #ifndef QCLUCENE_CONFIG_P_H
- #define QCLUCENE_CONFIG_P_H
- 
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h	2014-10-31 23:44:32.368856494 +0100
-@@ -29,20 +29,10 @@
- // We mean it.
- //
- 
--#if !defined(_MSC_VER)
--#   include "qclucene-config_p.h"
--#endif
--
- #include <QtCore/QChar>
- #include <QtCore/QString>
- 
--#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
--#   if !defined(TCHAR)
--#       define TCHAR wchar_t
--#   endif
--#else
--#   include <qt_windows.h>
--#endif
-+#include <CLucene/StdHeader.h>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -54,52 +44,6 @@
- #   define Q_CLUCENE_EXPORT Q_DECL_IMPORT
- #endif
- 
--//
--//  W A R N I N G
--//  -------------
--//
--// adjustments here, need to be done in
--// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
--//
--#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
--
--#elif !defined(DISABLE_NAMESPACE)
--#   ifdef QT_NAMESPACE
--#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
--#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
--
--#       define CL_NS_END }}}
--#       define CL_NS_END2 }}}}
--
--#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
--#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
--
--#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
--#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
--#   else
--#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
--#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
--
--#       define CL_NS_END }}
--#       define CL_NS_END2 }}}
--
--#       define CL_NS_USE(sub) using namespace lucene::sub;
--#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
--
--#       define CL_NS(sub) lucene::sub
--#       define CL_NS2(sub,sub2) lucene::sub::sub2
--#   endif
--#else
--#   define CL_NS_DEF(sub)
--#   define CL_NS_DEF2(sub, sub2)
--#   define CL_NS_END
--#   define CL_NS_END2
--#   define CL_NS_USE(sub)
--#   define CL_NS_USE2(sub,sub2)
--#   define CL_NS(sub)
--#   define CL_NS2(sub,sub2)
--#endif
--
- namespace QtCLuceneHelpers {
-     inline TCHAR* QStringToTChar(const QString &str)
-     {
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp	2014-10-31 23:47:52.184907583 +0100
-@@ -18,6 +18,8 @@
- #include "qindexreader_p.h"
- #include "qclucene_global_p.h"
- 
-+#include <QtCore/QDir>
-+
- #include <CLucene.h>
- #include <CLucene/index/IndexReader.h>
- 
-@@ -59,13 +61,13 @@
- {
-     using namespace lucene::index;
- 
--    return IndexReader::isLuceneFile(filename);
-+    return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
- }
- 
- bool QCLuceneIndexReader::indexExists(const QString &directory)
- {
-     using namespace lucene::index;
--    return IndexReader::indexExists(directory);
-+    return IndexReader::indexExists(directory.toLocal8Bit().constData());
- }
- 
- QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
-@@ -73,7 +75,7 @@
-     using namespace lucene::index;
- 
-     QCLuceneIndexReader indexReader;
--    indexReader.d->reader = IndexReader::open(path);
-+    indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
- 
-     return indexReader;
- }
-@@ -81,25 +83,29 @@
- void QCLuceneIndexReader::unlock(const QString &path)
- {
-     using namespace lucene::index;
--    IndexReader::unlock(path);
-+    IndexReader::unlock(path.toLocal8Bit().constData());
- }
- 
- bool QCLuceneIndexReader::isLocked(const QString &directory)
- {
-+    // The system CLucene fails here if the directory does not exist yet, unlike
-+    // the bundled one. Work around that.
-+    QDir::current().mkpath(directory);
-+
-     using namespace lucene::index;
--    return IndexReader::isLocked(directory);
-+    return IndexReader::isLocked(directory.toLocal8Bit().constData());
- }
- 
- quint64 QCLuceneIndexReader::lastModified(const QString &directory)
- {
-     using namespace lucene::index;
--    return quint64(IndexReader::lastModified(directory));
-+    return quint64(IndexReader::lastModified(directory.toLocal8Bit().constData()));
- }
- 
- qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
- {
-     using namespace lucene::index;
--    return qint64(IndexReader::getCurrentVersion(directory));
-+    return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
- }
- 
- void QCLuceneIndexReader::close()
-@@ -155,7 +161,7 @@
- void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
- {
-     TCHAR *fieldName = QStringToTChar(field);
--    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
-+    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
-     delete [] fieldName;
- }
- 
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp	2014-10-31 23:44:32.369856502 +0100
-@@ -18,6 +18,8 @@
- #include "qindexwriter_p.h"
- #include "qindexreader_p.h"
- 
-+#include <QtCore/QDir>
-+
- #include <CLucene.h>
- #include <CLucene/index/IndexWriter.h>
- 
-@@ -50,7 +52,12 @@
-     : d(new QCLuceneIndexWriterPrivate())
-     , analyzer(analyzer)
- {
--    d->writer = new lucene::index::IndexWriter(path,
-+    // The system CLucene cannot create directories recursively, so do it here.
-+    // Ignore failure: If it failed, we will get an error from CLucene anyway.
-+    if (create)
-+        QDir::current().mkpath(path);
-+
-+    d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(),
-         analyzer.d->analyzer, create, closeDir);
- }
- 
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp	2014-10-31 23:44:32.369856502 +0100
-@@ -95,7 +95,7 @@
-     : QCLuceneSearcher()
- {
-     lucene::search::IndexSearcher *searcher =
--        new lucene::search::IndexSearcher(path);
-+        new lucene::search::IndexSearcher(path.toLocal8Bit().constData());
- 
-     reader.d->reader = searcher->getReader();
-     reader.d->deleteCLuceneIndexReader = false;
-diff -ur qttools-opensource-src-5.3.2/src/assistant/help/help.pro qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro
---- qttools-opensource-src-5.3.2/src/assistant/help/help.pro	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro	2014-10-31 23:44:32.369856502 +0100
-@@ -34,6 +34,7 @@
-     qhelp_global.cpp
- 
- # access to clucene
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
- SOURCES += qhelpsearchindexwriter_clucene.cpp \
-     qhelpsearchindexreader_clucene.cpp
- HEADERS += qhelpenginecore.h \
-- 
cgit v0.10.2


>From 15efa9d2d2447dc8243a6001bb0dd002edf35fab Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:48:57 -0600
Subject: Revert "Revert "bootstrap""

This reverts commit 279d24ae1ffea1c86f53c3121f26978b6c32e97b.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index cf6bc67..ac54328 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,18 +1,18 @@
 
 %global qt_module qttools
-%global system_clucene 1
+#global system_clucene 1
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools builds are not yet available
 # only primary archs (for now), allow secondary to bootstrap
-%ifarch %{arm} %{ix86} x86_64
-%define docs 1
-%endif
+#ifarch %{arm} %{ix86} x86_64
+#define docs 1
+#endif
 
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 3%{?dist}
+Release: 2%{?dist}.1
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,8 +358,8 @@ fi
 
 
 %changelog
-* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
-- rebuild (clucene09)
+* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2.1
+- bootstrap
 
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
-- 
cgit v0.10.2


>From b83a7428892a460277c9063fab4d45491cb98623 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:48:58 -0600
Subject: Revert "bootstrap"

This reverts commit d91e9dfb43024144b0d264764b0559115b1b75f5.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index ac54328..cf6bc67 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,18 +1,18 @@
 
 %global qt_module qttools
-#global system_clucene 1
+%global system_clucene 1
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools builds are not yet available
 # only primary archs (for now), allow secondary to bootstrap
-#ifarch %{arm} %{ix86} x86_64
-#define docs 1
-#endif
+%ifarch %{arm} %{ix86} x86_64
+%define docs 1
+%endif
 
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,8 +358,8 @@ fi
 
 
 %changelog
-* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2.1
-- bootstrap
+* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
+- rebuild (clucene09)
 
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
-- 
cgit v0.10.2


>From 16635c3c45706683b01d552443c3a9c41c696753 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:48:58 -0600
Subject: Revert "rebuild (clucene09)"

This reverts commit 92cef521c7b85e3447582d05687c9f509cc9c8d8.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index cf6bc67..2b3a3b4 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -12,7 +12,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 3%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,9 +358,6 @@ fi
 
 
 %changelog
-* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
-- rebuild (clucene09)
-
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
 
-- 
cgit v0.10.2


>From b91848f999f092340c5818ead8b89ec4310d1b37 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:52:01 -0600
Subject: Revert "Fix qdbusviewer-qt5 icon"

This reverts commit 1722cb8b8569232018ae983ec4530a7fe797d3d8.

diff --git a/qdbusviewer.desktop b/qdbusviewer.desktop
index 188da47..d6e0f0a 100644
--- a/qdbusviewer.desktop
+++ b/qdbusviewer.desktop
@@ -3,7 +3,7 @@ Name=Qt5 QDbusViewer
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
 Exec=qdbusviewer-qt5
-Icon=qdbusviewer-qt5
+Icon=qt5-qdbusviewer
 Terminal=false
 Type=Application
 Categories=Qt;Development;Debugger;
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index ec25ce5..0ce986a 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -14,7 +14,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 5%{?dist}
+Release: 4%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -355,9 +355,6 @@ fi
 
 
 %changelog
-* Tue Dec 09 2014 Daniel Vrátil <dvratil at redhat.com> 5.3.2-5
-- fix icon name in qdbusviewer-qt5.desktop
-
 * Thu Dec 04 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.3.2-4
 - system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups
 - F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293)
-- 
cgit v0.10.2


>From c4abe2a74a433c8cd6cae6c908fd2efe8116d66c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:52:02 -0600
Subject: Revert "system-clucene patch fixes: some required QDir::mkpath in
 QtCLucene, cleanups"

This reverts commit aab042cb30276d58e2348f6a5e6addb390b0fafa.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 0ce986a..cf6bc67 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,8 +1,6 @@
 
 %global qt_module qttools
-%if 0%{?fedora} > 19 || 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 +12,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 4%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -25,7 +23,7 @@ Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%
 Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 %endif
 
-Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
+Patch1: qttools-opensource-src-5.3.0-system-clucene.patch
 
 # help lrelease/lupdate use/prefer qmake-qt5
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
@@ -49,7 +47,12 @@ BuildRequires: qt5-qtdeclarative-static
 BuildRequires: qt5-qtwebkit-devel
 
 %if 0%{?system_clucene}
-BuildRequires: clucene09-core-devel >= 0.9.21b-12
+%if 0%{?fedora} || 0%{?rhel} > 6
+BuildRequires: clucene09-core-devel
+%else
+BuildConflicts: clucene-core-devel > 2
+BuildRequires: clucene-core-devel
+%endif
 %endif
 
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -355,11 +358,6 @@ fi
 
 
 %changelog
-* Thu Dec 04 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.3.2-4
-- system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups
-- F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293)
-- disable system-clucene where refcounted clucene09 not available (#1128293)
-
 * Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
 - rebuild (clucene09)
 
diff --git a/qttools-opensource-src-5.3.0-system-clucene.patch b/qttools-opensource-src-5.3.0-system-clucene.patch
new file mode 100644
index 0000000..21fd880
--- /dev/null
+++ b/qttools-opensource-src-5.3.0-system-clucene.patch
@@ -0,0 +1,325 @@
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri	2014-05-30 12:31:10.921201196 -0500
+@@ -1,125 +1,8 @@
+-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
+-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
+-
+-CLUCENEDIR = ../3rdparty/clucene/src/CLucene
+-
+-INCLUDEPATH += . .. \
+-               $$CLUCENEDIR \
+-               $$CLUCENEDIR/../ \
+-               $$CLUCENEDIR/analysis \
+-               $$CLUCENEDIR/analysis/standard \
+-               $$CLUCENEDIR/config \
+-               $$CLUCENEDIR/debug \
+-               $$CLUCENEDIR/document \
+-               $$CLUCENEDIR/index \
+-               $$CLUCENEDIR/queryParser \
+-               $$CLUCENEDIR/search \
+-               $$CLUCENEDIR/store \
+-               $$CLUCENEDIR/util
+-
+-
+-SOURCES += $$CLUCENEDIR/StdHeader.cpp \
+-           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
+-           $$CLUCENEDIR/analysis/Analyzers.cpp \
+-           $$CLUCENEDIR/config/gunichartables.cpp \
+-           $$CLUCENEDIR/config/repl_lltot.cpp \
+-           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
+-           $$CLUCENEDIR/config/repl_tcslwr.cpp \
+-           $$CLUCENEDIR/config/repl_tcstod.cpp \
+-           $$CLUCENEDIR/config/repl_tcstoll.cpp \
+-           $$CLUCENEDIR/config/repl_tprintf.cpp \
+-           $$CLUCENEDIR/config/threads.cpp \
+-           $$CLUCENEDIR/config/utf8.cpp \
+-           $$CLUCENEDIR/debug/condition.cpp \
+-           $$CLUCENEDIR/debug/error.cpp \
+-           $$CLUCENEDIR/debug/memtracking.cpp \
+-           $$CLUCENEDIR/document/DateField.cpp \
+-           $$CLUCENEDIR/document/Document.cpp \
+-           $$CLUCENEDIR/document/Field.cpp \
+-           $$CLUCENEDIR/index/CompoundFile.cpp \
+-           $$CLUCENEDIR/index/DocumentWriter.cpp \
+-           $$CLUCENEDIR/index/FieldInfos.cpp \
+-           $$CLUCENEDIR/index/FieldsReader.cpp \
+-           $$CLUCENEDIR/index/FieldsWriter.cpp \
+-           $$CLUCENEDIR/index/IndexModifier.cpp \
+-           $$CLUCENEDIR/index/IndexReader.cpp \
+-           $$CLUCENEDIR/index/IndexWriter.cpp \
+-           $$CLUCENEDIR/index/MultiReader.cpp \
+-           $$CLUCENEDIR/index/SegmentInfos.cpp \
+-           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
+-           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
+-           $$CLUCENEDIR/index/SegmentMerger.cpp \
+-           $$CLUCENEDIR/index/SegmentReader.cpp \
+-           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
+-           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
+-           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
+-           $$CLUCENEDIR/index/SegmentTermVector.cpp \
+-           $$CLUCENEDIR/index/Term.cpp \
+-           $$CLUCENEDIR/index/TermInfo.cpp \
+-           $$CLUCENEDIR/index/TermInfosReader.cpp \
+-           $$CLUCENEDIR/index/TermInfosWriter.cpp \
+-           $$CLUCENEDIR/index/TermVectorReader.cpp \
+-           $$CLUCENEDIR/index/TermVectorWriter.cpp \
+-           $$CLUCENEDIR/queryParser/Lexer.cpp \
+-           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
+-           $$CLUCENEDIR/queryParser/QueryParser.cpp \
+-           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
+-           $$CLUCENEDIR/queryParser/QueryToken.cpp \
+-           $$CLUCENEDIR/queryParser/TokenList.cpp \
+-           $$CLUCENEDIR/search/BooleanQuery.cpp \
+-           $$CLUCENEDIR/search/BooleanScorer.cpp \
+-           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
+-           $$CLUCENEDIR/search/ChainedFilter.cpp \
+-           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
+-           $$CLUCENEDIR/search/DateFilter.cpp \
+-           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
+-           $$CLUCENEDIR/search/Explanation.cpp \
+-           $$CLUCENEDIR/search/FieldCache.cpp \
+-           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
+-           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
+-           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
+-           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
+-           $$CLUCENEDIR/search/FuzzyQuery.cpp \
+-           $$CLUCENEDIR/search/HitQueue.cpp \
+-           $$CLUCENEDIR/search/Hits.cpp \
+-           $$CLUCENEDIR/search/IndexSearcher.cpp \
+-           $$CLUCENEDIR/search/MultiSearcher.cpp \
+-           $$CLUCENEDIR/search/MultiTermQuery.cpp \
+-           $$CLUCENEDIR/search/PhrasePositions.cpp \
+-           $$CLUCENEDIR/search/PhraseQuery.cpp \
+-           $$CLUCENEDIR/search/PhraseScorer.cpp \
+-           $$CLUCENEDIR/search/PrefixQuery.cpp \
+-           $$CLUCENEDIR/search/QueryFilter.cpp \
+-           $$CLUCENEDIR/search/RangeFilter.cpp \
+-           $$CLUCENEDIR/search/RangeQuery.cpp \
+-           $$CLUCENEDIR/search/SearchHeader.cpp \
+-           $$CLUCENEDIR/search/Similarity.cpp \
+-           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
+-           $$CLUCENEDIR/search/Sort.cpp \
+-           $$CLUCENEDIR/search/TermQuery.cpp \
+-           $$CLUCENEDIR/search/TermScorer.cpp \
+-           $$CLUCENEDIR/search/WildcardQuery.cpp \
+-           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
+-           $$CLUCENEDIR/store/FSDirectory.cpp \
+-           $$CLUCENEDIR/store/IndexInput.cpp \
+-           $$CLUCENEDIR/store/IndexOutput.cpp \
+-           $$CLUCENEDIR/store/Lock.cpp \
+-           $$CLUCENEDIR/store/MMapInput.cpp \
+-           $$CLUCENEDIR/store/RAMDirectory.cpp \
+-           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
+-           $$CLUCENEDIR/util/BitSet.cpp \
+-           $$CLUCENEDIR/util/Equators.cpp \
+-           $$CLUCENEDIR/util/FastCharStream.cpp \
+-           $$CLUCENEDIR/util/fileinputstream.cpp \
+-           $$CLUCENEDIR/util/Misc.cpp \
+-           $$CLUCENEDIR/util/Reader.cpp \
+-           $$CLUCENEDIR/util/StringBuffer.cpp \
+-           $$CLUCENEDIR/util/StringIntern.cpp \
+-           $$CLUCENEDIR/util/ThreadLocal.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
+ 
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
++LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
++DEFINES += LUCENE_ENABLE_REFCOUNT
++QMAKE_CXXFLAGS += -fpermissive
+ 
+ #Header files
+ HEADERS += qclucene_global_p.h \
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h	2014-05-30 12:31:10.922201214 -0500
+@@ -15,6 +15,8 @@
+ **
+ ****************************************************************************/
+ 
++#error This header must not be included when building against system CLucene.
++
+ #ifndef QCLUCENE_CONFIG_P_H
+ #define QCLUCENE_CONFIG_P_H
+ 
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h	2014-05-30 12:31:10.923201233 -0500
+@@ -29,20 +29,10 @@
+ // We mean it.
+ //
+ 
+-#if !defined(_MSC_VER)
+-#   include "qclucene-config_p.h"
+-#endif
+-
+ #include <QtCore/QChar>
+ #include <QtCore/QString>
+ 
+-#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+-#   if !defined(TCHAR)
+-#       define TCHAR wchar_t
+-#   endif
+-#else
+-#   include <qt_windows.h>
+-#endif
++#include <CLucene/StdHeader.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE
+ #   define Q_CLUCENE_EXPORT Q_DECL_IMPORT
+ #endif
+ 
+-//
+-//  W A R N I N G
+-//  -------------
+-//
+-// adjustments here, need to be done in
+-// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
+-//
+-#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
+-
+-#elif !defined(DISABLE_NAMESPACE)
+-#   ifdef QT_NAMESPACE
+-#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
+-#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
+-
+-#       define CL_NS_END }}}
+-#       define CL_NS_END2 }}}}
+-
+-#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
+-#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
+-
+-#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
+-#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
+-#   else
+-#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
+-#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
+-
+-#       define CL_NS_END }}
+-#       define CL_NS_END2 }}}
+-
+-#       define CL_NS_USE(sub) using namespace lucene::sub;
+-#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
+-
+-#       define CL_NS(sub) lucene::sub
+-#       define CL_NS2(sub,sub2) lucene::sub::sub2
+-#   endif
+-#else
+-#   define CL_NS_DEF(sub)
+-#   define CL_NS_DEF2(sub, sub2)
+-#   define CL_NS_END
+-#   define CL_NS_END2
+-#   define CL_NS_USE(sub)
+-#   define CL_NS_USE2(sub,sub2)
+-#   define CL_NS(sub)
+-#   define CL_NS2(sub,sub2)
+-#endif
+-
+ namespace QtCLuceneHelpers {
+     inline TCHAR* QStringToTChar(const QString &str)
+     {
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp	2014-05-30 12:31:10.924201251 -0500
+@@ -59,13 +59,13 @@ bool QCLuceneIndexReader::isLuceneFile(c
+ {
+     using namespace lucene::index;
+ 
+-    return IndexReader::isLuceneFile(filename);
++    return IndexReader::isLuceneFile(filename.toStdString().c_str());
+ }
+ 
+ bool QCLuceneIndexReader::indexExists(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return IndexReader::indexExists(directory);
++    return IndexReader::indexExists(directory.toStdString().c_str());
+ }
+ 
+ QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
+@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader:
+     using namespace lucene::index;
+ 
+     QCLuceneIndexReader indexReader;
+-    indexReader.d->reader = IndexReader::open(path);
++    indexReader.d->reader = IndexReader::open(path.toStdString().c_str());
+ 
+     return indexReader;
+ }
+@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader:
+ void QCLuceneIndexReader::unlock(const QString &path)
+ {
+     using namespace lucene::index;
+-    IndexReader::unlock(path);
++    IndexReader::unlock(path.toStdString().c_str());
+ }
+ 
+ bool QCLuceneIndexReader::isLocked(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return IndexReader::isLocked(directory);
++    return IndexReader::isLocked(directory.toStdString().c_str());
+ }
+ 
+ quint64 QCLuceneIndexReader::lastModified(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return quint64(IndexReader::lastModified(directory));
++    return quint64(IndexReader::lastModified(directory.toStdString().c_str()));
+ }
+ 
+ qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return qint64(IndexReader::getCurrentVersion(directory));
++    return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str()));
+ }
+ 
+ void QCLuceneIndexReader::close()
+@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3
+ void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
+ {
+     TCHAR *fieldName = QStringToTChar(field);
+-    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
++    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
+     delete [] fieldName;
+ }
+ 
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp	2014-05-30 12:31:10.925201269 -0500
+@@ -50,7 +50,7 @@ QCLuceneIndexWriter::QCLuceneIndexWriter
+     : d(new QCLuceneIndexWriterPrivate())
+     , analyzer(analyzer)
+ {
+-    d->writer = new lucene::index::IndexWriter(path,
++    d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(),
+         analyzer.d->analyzer, create, closeDir);
+ }
+ 
+diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp
+--- qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp.system_clucene	2014-05-15 12:12:39.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp	2014-05-30 12:31:10.926201287 -0500
+@@ -95,7 +95,7 @@ QCLuceneIndexSearcher::QCLuceneIndexSear
+     : QCLuceneSearcher()
+ {
+     lucene::search::IndexSearcher *searcher =
+-        new lucene::search::IndexSearcher(path);
++        new lucene::search::IndexSearcher(path.toStdString().c_str());
+ 
+     reader.d->reader = searcher->getReader();
+     reader.d->deleteCLuceneIndexReader = false;
+diff -up qttools-opensource-src-5.3.0/src/assistant/help/help.pro.system_clucene qttools-opensource-src-5.3.0/src/assistant/help/help.pro
+--- qttools-opensource-src-5.3.0/src/assistant/help/help.pro.system_clucene	2014-05-15 12:12:40.000000000 -0500
++++ qttools-opensource-src-5.3.0/src/assistant/help/help.pro	2014-05-30 12:50:57.233287205 -0500
+@@ -34,6 +34,7 @@ SOURCES += qhelpenginecore.cpp \
+     qhelp_global.cpp
+ 
+ # access to clucene
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
+ SOURCES += qhelpsearchindexwriter_clucene.cpp \
+     qhelpsearchindexreader_clucene.cpp
+ HEADERS += qhelpenginecore.h \
diff --git a/qttools-opensource-src-5.3.2-system-clucene.patch b/qttools-opensource-src-5.3.2-system-clucene.patch
deleted file mode 100644
index 5a358f5..0000000
--- a/qttools-opensource-src-5.3.2-system-clucene.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri
---- qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri	2014-10-31 23:44:32.368856494 +0100
-@@ -1,125 +1,7 @@
--DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
--win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
--
--CLUCENEDIR = ../3rdparty/clucene/src/CLucene
--
--INCLUDEPATH += . .. \
--               $$CLUCENEDIR \
--               $$CLUCENEDIR/../ \
--               $$CLUCENEDIR/analysis \
--               $$CLUCENEDIR/analysis/standard \
--               $$CLUCENEDIR/config \
--               $$CLUCENEDIR/debug \
--               $$CLUCENEDIR/document \
--               $$CLUCENEDIR/index \
--               $$CLUCENEDIR/queryParser \
--               $$CLUCENEDIR/search \
--               $$CLUCENEDIR/store \
--               $$CLUCENEDIR/util
--
--
--SOURCES += $$CLUCENEDIR/StdHeader.cpp \
--           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
--           $$CLUCENEDIR/analysis/Analyzers.cpp \
--           $$CLUCENEDIR/config/gunichartables.cpp \
--           $$CLUCENEDIR/config/repl_lltot.cpp \
--           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
--           $$CLUCENEDIR/config/repl_tcslwr.cpp \
--           $$CLUCENEDIR/config/repl_tcstod.cpp \
--           $$CLUCENEDIR/config/repl_tcstoll.cpp \
--           $$CLUCENEDIR/config/repl_tprintf.cpp \
--           $$CLUCENEDIR/config/threads.cpp \
--           $$CLUCENEDIR/config/utf8.cpp \
--           $$CLUCENEDIR/debug/condition.cpp \
--           $$CLUCENEDIR/debug/error.cpp \
--           $$CLUCENEDIR/debug/memtracking.cpp \
--           $$CLUCENEDIR/document/DateField.cpp \
--           $$CLUCENEDIR/document/Document.cpp \
--           $$CLUCENEDIR/document/Field.cpp \
--           $$CLUCENEDIR/index/CompoundFile.cpp \
--           $$CLUCENEDIR/index/DocumentWriter.cpp \
--           $$CLUCENEDIR/index/FieldInfos.cpp \
--           $$CLUCENEDIR/index/FieldsReader.cpp \
--           $$CLUCENEDIR/index/FieldsWriter.cpp \
--           $$CLUCENEDIR/index/IndexModifier.cpp \
--           $$CLUCENEDIR/index/IndexReader.cpp \
--           $$CLUCENEDIR/index/IndexWriter.cpp \
--           $$CLUCENEDIR/index/MultiReader.cpp \
--           $$CLUCENEDIR/index/SegmentInfos.cpp \
--           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
--           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
--           $$CLUCENEDIR/index/SegmentMerger.cpp \
--           $$CLUCENEDIR/index/SegmentReader.cpp \
--           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
--           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
--           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
--           $$CLUCENEDIR/index/SegmentTermVector.cpp \
--           $$CLUCENEDIR/index/Term.cpp \
--           $$CLUCENEDIR/index/TermInfo.cpp \
--           $$CLUCENEDIR/index/TermInfosReader.cpp \
--           $$CLUCENEDIR/index/TermInfosWriter.cpp \
--           $$CLUCENEDIR/index/TermVectorReader.cpp \
--           $$CLUCENEDIR/index/TermVectorWriter.cpp \
--           $$CLUCENEDIR/queryParser/Lexer.cpp \
--           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
--           $$CLUCENEDIR/queryParser/QueryParser.cpp \
--           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
--           $$CLUCENEDIR/queryParser/QueryToken.cpp \
--           $$CLUCENEDIR/queryParser/TokenList.cpp \
--           $$CLUCENEDIR/search/BooleanQuery.cpp \
--           $$CLUCENEDIR/search/BooleanScorer.cpp \
--           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
--           $$CLUCENEDIR/search/ChainedFilter.cpp \
--           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
--           $$CLUCENEDIR/search/DateFilter.cpp \
--           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
--           $$CLUCENEDIR/search/Explanation.cpp \
--           $$CLUCENEDIR/search/FieldCache.cpp \
--           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
--           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
--           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
--           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
--           $$CLUCENEDIR/search/FuzzyQuery.cpp \
--           $$CLUCENEDIR/search/HitQueue.cpp \
--           $$CLUCENEDIR/search/Hits.cpp \
--           $$CLUCENEDIR/search/IndexSearcher.cpp \
--           $$CLUCENEDIR/search/MultiSearcher.cpp \
--           $$CLUCENEDIR/search/MultiTermQuery.cpp \
--           $$CLUCENEDIR/search/PhrasePositions.cpp \
--           $$CLUCENEDIR/search/PhraseQuery.cpp \
--           $$CLUCENEDIR/search/PhraseScorer.cpp \
--           $$CLUCENEDIR/search/PrefixQuery.cpp \
--           $$CLUCENEDIR/search/QueryFilter.cpp \
--           $$CLUCENEDIR/search/RangeFilter.cpp \
--           $$CLUCENEDIR/search/RangeQuery.cpp \
--           $$CLUCENEDIR/search/SearchHeader.cpp \
--           $$CLUCENEDIR/search/Similarity.cpp \
--           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
--           $$CLUCENEDIR/search/Sort.cpp \
--           $$CLUCENEDIR/search/TermQuery.cpp \
--           $$CLUCENEDIR/search/TermScorer.cpp \
--           $$CLUCENEDIR/search/WildcardQuery.cpp \
--           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
--           $$CLUCENEDIR/store/FSDirectory.cpp \
--           $$CLUCENEDIR/store/IndexInput.cpp \
--           $$CLUCENEDIR/store/IndexOutput.cpp \
--           $$CLUCENEDIR/store/Lock.cpp \
--           $$CLUCENEDIR/store/MMapInput.cpp \
--           $$CLUCENEDIR/store/RAMDirectory.cpp \
--           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
--           $$CLUCENEDIR/util/BitSet.cpp \
--           $$CLUCENEDIR/util/Equators.cpp \
--           $$CLUCENEDIR/util/FastCharStream.cpp \
--           $$CLUCENEDIR/util/fileinputstream.cpp \
--           $$CLUCENEDIR/util/Misc.cpp \
--           $$CLUCENEDIR/util/Reader.cpp \
--           $$CLUCENEDIR/util/StringBuffer.cpp \
--           $$CLUCENEDIR/util/StringIntern.cpp \
--           $$CLUCENEDIR/util/ThreadLocal.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
- 
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
-+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
-+#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
- 
- #Header files
- HEADERS += qclucene_global_p.h \
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h	2014-10-31 23:44:32.368856494 +0100
-@@ -15,6 +15,8 @@
- **
- ****************************************************************************/
- 
-+#error This header must not be included when building against system CLucene.
-+
- #ifndef QCLUCENE_CONFIG_P_H
- #define QCLUCENE_CONFIG_P_H
- 
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h	2014-10-31 23:44:32.368856494 +0100
-@@ -29,20 +29,10 @@
- // We mean it.
- //
- 
--#if !defined(_MSC_VER)
--#   include "qclucene-config_p.h"
--#endif
--
- #include <QtCore/QChar>
- #include <QtCore/QString>
- 
--#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
--#   if !defined(TCHAR)
--#       define TCHAR wchar_t
--#   endif
--#else
--#   include <qt_windows.h>
--#endif
-+#include <CLucene/StdHeader.h>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -54,52 +44,6 @@
- #   define Q_CLUCENE_EXPORT Q_DECL_IMPORT
- #endif
- 
--//
--//  W A R N I N G
--//  -------------
--//
--// adjustments here, need to be done in
--// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
--//
--#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
--
--#elif !defined(DISABLE_NAMESPACE)
--#   ifdef QT_NAMESPACE
--#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
--#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
--
--#       define CL_NS_END }}}
--#       define CL_NS_END2 }}}}
--
--#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
--#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
--
--#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
--#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
--#   else
--#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
--#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
--
--#       define CL_NS_END }}
--#       define CL_NS_END2 }}}
--
--#       define CL_NS_USE(sub) using namespace lucene::sub;
--#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
--
--#       define CL_NS(sub) lucene::sub
--#       define CL_NS2(sub,sub2) lucene::sub::sub2
--#   endif
--#else
--#   define CL_NS_DEF(sub)
--#   define CL_NS_DEF2(sub, sub2)
--#   define CL_NS_END
--#   define CL_NS_END2
--#   define CL_NS_USE(sub)
--#   define CL_NS_USE2(sub,sub2)
--#   define CL_NS(sub)
--#   define CL_NS2(sub,sub2)
--#endif
--
- namespace QtCLuceneHelpers {
-     inline TCHAR* QStringToTChar(const QString &str)
-     {
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp	2014-10-31 23:47:52.184907583 +0100
-@@ -18,6 +18,8 @@
- #include "qindexreader_p.h"
- #include "qclucene_global_p.h"
- 
-+#include <QtCore/QDir>
-+
- #include <CLucene.h>
- #include <CLucene/index/IndexReader.h>
- 
-@@ -59,13 +61,13 @@
- {
-     using namespace lucene::index;
- 
--    return IndexReader::isLuceneFile(filename);
-+    return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
- }
- 
- bool QCLuceneIndexReader::indexExists(const QString &directory)
- {
-     using namespace lucene::index;
--    return IndexReader::indexExists(directory);
-+    return IndexReader::indexExists(directory.toLocal8Bit().constData());
- }
- 
- QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
-@@ -73,7 +75,7 @@
-     using namespace lucene::index;
- 
-     QCLuceneIndexReader indexReader;
--    indexReader.d->reader = IndexReader::open(path);
-+    indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
- 
-     return indexReader;
- }
-@@ -81,25 +83,29 @@
- void QCLuceneIndexReader::unlock(const QString &path)
- {
-     using namespace lucene::index;
--    IndexReader::unlock(path);
-+    IndexReader::unlock(path.toLocal8Bit().constData());
- }
- 
- bool QCLuceneIndexReader::isLocked(const QString &directory)
- {
-+    // The system CLucene fails here if the directory does not exist yet, unlike
-+    // the bundled one. Work around that.
-+    QDir::current().mkpath(directory);
-+
-     using namespace lucene::index;
--    return IndexReader::isLocked(directory);
-+    return IndexReader::isLocked(directory.toLocal8Bit().constData());
- }
- 
- quint64 QCLuceneIndexReader::lastModified(const QString &directory)
- {
-     using namespace lucene::index;
--    return quint64(IndexReader::lastModified(directory));
-+    return quint64(IndexReader::lastModified(directory.toLocal8Bit().constData()));
- }
- 
- qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
- {
-     using namespace lucene::index;
--    return qint64(IndexReader::getCurrentVersion(directory));
-+    return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
- }
- 
- void QCLuceneIndexReader::close()
-@@ -155,7 +161,7 @@
- void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
- {
-     TCHAR *fieldName = QStringToTChar(field);
--    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
-+    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
-     delete [] fieldName;
- }
- 
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp	2014-10-31 23:44:32.369856502 +0100
-@@ -18,6 +18,8 @@
- #include "qindexwriter_p.h"
- #include "qindexreader_p.h"
- 
-+#include <QtCore/QDir>
-+
- #include <CLucene.h>
- #include <CLucene/index/IndexWriter.h>
- 
-@@ -50,7 +52,12 @@
-     : d(new QCLuceneIndexWriterPrivate())
-     , analyzer(analyzer)
- {
--    d->writer = new lucene::index::IndexWriter(path,
-+    // The system CLucene cannot create directories recursively, so do it here.
-+    // Ignore failure: If it failed, we will get an error from CLucene anyway.
-+    if (create)
-+        QDir::current().mkpath(path);
-+
-+    d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(),
-         analyzer.d->analyzer, create, closeDir);
- }
- 
-diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp
---- qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp	2014-10-31 23:44:32.369856502 +0100
-@@ -95,7 +95,7 @@
-     : QCLuceneSearcher()
- {
-     lucene::search::IndexSearcher *searcher =
--        new lucene::search::IndexSearcher(path);
-+        new lucene::search::IndexSearcher(path.toLocal8Bit().constData());
- 
-     reader.d->reader = searcher->getReader();
-     reader.d->deleteCLuceneIndexReader = false;
-diff -ur qttools-opensource-src-5.3.2/src/assistant/help/help.pro qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro
---- qttools-opensource-src-5.3.2/src/assistant/help/help.pro	2014-09-11 12:48:25.000000000 +0200
-+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro	2014-10-31 23:44:32.369856502 +0100
-@@ -34,6 +34,7 @@
-     qhelp_global.cpp
- 
- # access to clucene
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
- SOURCES += qhelpsearchindexwriter_clucene.cpp \
-     qhelpsearchindexreader_clucene.cpp
- HEADERS += qhelpenginecore.h \
-- 
cgit v0.10.2


>From 896b4094b915d6fc4ccca1c8a9e057e8cd0a2a9a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:52:03 -0600
Subject: Revert "Revert "bootstrap""

This reverts commit 279d24ae1ffea1c86f53c3121f26978b6c32e97b.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index cf6bc67..ac54328 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,18 +1,18 @@
 
 %global qt_module qttools
-%global system_clucene 1
+#global system_clucene 1
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools builds are not yet available
 # only primary archs (for now), allow secondary to bootstrap
-%ifarch %{arm} %{ix86} x86_64
-%define docs 1
-%endif
+#ifarch %{arm} %{ix86} x86_64
+#define docs 1
+#endif
 
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 3%{?dist}
+Release: 2%{?dist}.1
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,8 +358,8 @@ fi
 
 
 %changelog
-* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
-- rebuild (clucene09)
+* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2.1
+- bootstrap
 
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
-- 
cgit v0.10.2


>From c0179deafd6e73b9c51ecc0714134b81e30a1ded Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:52:04 -0600
Subject: Revert "bootstrap"

This reverts commit d91e9dfb43024144b0d264764b0559115b1b75f5.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index ac54328..cf6bc67 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,18 +1,18 @@
 
 %global qt_module qttools
-#global system_clucene 1
+%global system_clucene 1
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools builds are not yet available
 # only primary archs (for now), allow secondary to bootstrap
-#ifarch %{arm} %{ix86} x86_64
-#define docs 1
-#endif
+%ifarch %{arm} %{ix86} x86_64
+%define docs 1
+%endif
 
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,8 +358,8 @@ fi
 
 
 %changelog
-* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2.1
-- bootstrap
+* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
+- rebuild (clucene09)
 
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
-- 
cgit v0.10.2


>From 0d06dc97d43aa5fd585ed04ed9c67a72a584b0fb Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 11 Dec 2014 06:52:04 -0600
Subject: Revert "rebuild (clucene09)"

This reverts commit 92cef521c7b85e3447582d05687c9f509cc9c8d8.

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index cf6bc67..2b3a3b4 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -12,7 +12,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.3.2
-Release: 3%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -358,9 +358,6 @@ fi
 
 
 %changelog
-* Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-3
-- rebuild (clucene09)
-
 * Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
 - -devel: Requires: qt5-designer-plugin-webkit
 
-- 
cgit v0.10.2


>From c83305c60b9fee84499034bfabea62d5b3d05209 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 19 Feb 2015 12:45:30 -0600
Subject: rebuild (gcc5)


diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 6876d18..78587d1 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -17,7 +17,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -424,6 +424,9 @@ fi
 
 
 %changelog
+* Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.4.0-2
+- rebuild (gcc5)
+
 * Wed Dec 10 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-1
 - 5.4.0 (final)
 
-- 
cgit v0.10.2


>From e4d350f2358db8ce0c50fbb0b27d6ac32d47ccac Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich at redhat.com>
Date: Tue, 24 Feb 2015 17:31:31 +0100
Subject: Update to 5.4.1


diff --git a/.gitignore b/.gitignore
index 1334a2d..6d7bc90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qttools-opensource-src-5.4.0.tar.xz
+/qttools-opensource-src-5.4.1.tar.xz
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 78587d1..b4c3878 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -16,8 +16,8 @@
 
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
-Version: 5.4.0
-Release: 2%{?dist}
+Version: 5.4.1
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -424,6 +424,9 @@ fi
 
 
 %changelog
+* Tue Feb 24 2015 Jan Grulich <jgrulich at redhat.com> 5.4.1-1
+- 5.4.1
+
 * Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.4.0-2
 - rebuild (gcc5)
 
diff --git a/sources b/sources
index f05db4c..38be805 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3de5923257b365526856094d7da0ad85  qttools-opensource-src-5.4.0.tar.xz
+5b2fd42304e9294bc0f77095fdb35ad6  qttools-opensource-src-5.4.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qt5-qttools.git/commit/?h=el6&id=0484945676b37276a1cf1018afa51af72a451371

More information about the scm-commits mailing list