From 92cef521c7b85e3447582d05687c9f509cc9c8d8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 3 Dec 2014 23:03:21 -0600 Subject: [PATCH 01/18] rebuild (clucene09) --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 5.3.2-3 +- rebuild (clucene09) + * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From d91e9dfb43024144b0d264764b0559115b1b75f5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 3 Dec 2014 23:16:15 -0600 Subject: [PATCH 02/18] bootstrap --- qt5-qttools.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 5.3.2-3 -- rebuild (clucene09) +* Wed Dec 03 2014 Rex Dieter 5.3.2-2.1 +- bootstrap * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From 279d24ae1ffea1c86f53c3121f26978b6c32e97b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 4 Dec 2014 06:53:31 -0600 Subject: [PATCH 03/18] Revert "bootstrap" This reverts commit d91e9dfb43024144b0d264764b0559115b1b75f5. --- qt5-qttools.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 5.3.2-2.1 -- bootstrap +* Wed Dec 03 2014 Rex Dieter 5.3.2-3 +- rebuild (clucene09) * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From aab042cb30276d58e2348f6a5e6addb390b0fafa Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 4 Dec 2014 21:30:42 +0100 Subject: [PATCH 04/18] system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups * Thu Dec 04 2014 Kevin Kofler 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. --- qt5-qttools.spec | 18 +-- ...-opensource-src-5.3.2-system-clucene.patch | 108 +++++++++++------- 2 files changed, 77 insertions(+), 49 deletions(-) rename qttools-opensource-src-5.3.0-system-clucene.patch => qttools-opensource-src-5.3.2-system-clucene.patch (71%) 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 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 5.3.2-3 - rebuild (clucene09) diff --git a/qttools-opensource-src-5.3.0-system-clucene.patch b/qttools-opensource-src-5.3.2-system-clucene.patch similarity index 71% rename from qttools-opensource-src-5.3.0-system-clucene.patch rename to qttools-opensource-src-5.3.2-system-clucene.patch index 21fd880..5a358f5 100644 --- a/qttools-opensource-src-5.3.0-system-clucene.patch +++ b/qttools-opensource-src-5.3.2-system-clucene.patch @@ -1,7 +1,7 @@ -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 @@ +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 - @@ -126,14 +126,13 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.s +INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS] +LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene -+DEFINES += LUCENE_ENABLE_REFCOUNT -+QMAKE_CXXFLAGS += -fpermissive ++#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!) #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 +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 @@ ** ****************************************************************************/ @@ -143,9 +142,9 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h. #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 +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. // @@ -168,7 +167,7 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h. QT_BEGIN_NAMESPACE -@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE +@@ -54,52 +44,6 @@ # define Q_CLUCENE_EXPORT Q_DECL_IMPORT #endif @@ -221,65 +220,78 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h. 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 +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 ++ + #include + #include + +@@ -59,13 +61,13 @@ { using namespace lucene::index; - return IndexReader::isLuceneFile(filename); -+ return IndexReader::isLuceneFile(filename.toStdString().c_str()); ++ return IndexReader::isLuceneFile(filename.toLocal8Bit().constData()); } bool QCLuceneIndexReader::indexExists(const QString &directory) { using namespace lucene::index; - return IndexReader::indexExists(directory); -+ return IndexReader::indexExists(directory.toStdString().c_str()); ++ return IndexReader::indexExists(directory.toLocal8Bit().constData()); } QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path) -@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader: +@@ -73,7 +75,7 @@ using namespace lucene::index; QCLuceneIndexReader indexReader; - indexReader.d->reader = IndexReader::open(path); -+ indexReader.d->reader = IndexReader::open(path.toStdString().c_str()); ++ indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData()); return indexReader; } -@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader: +@@ -81,25 +83,29 @@ void QCLuceneIndexReader::unlock(const QString &path) { using namespace lucene::index; - IndexReader::unlock(path); -+ IndexReader::unlock(path.toStdString().c_str()); ++ 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.toStdString().c_str()); ++ 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.toStdString().c_str())); ++ 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.toStdString().c_str())); ++ return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData())); } void QCLuceneIndexReader::close() -@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3 +@@ -155,7 +161,7 @@ void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value) { TCHAR *fieldName = QStringToTChar(field); @@ -288,34 +300,48 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.sys 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 +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 ++ + #include + #include + +@@ -50,7 +52,12 @@ : d(new QCLuceneIndexWriterPrivate()) , analyzer(analyzer) { - d->writer = new lucene::index::IndexWriter(path, -+ d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(), ++ // 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 -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 +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.toStdString().c_str()); ++ new lucene::search::IndexSearcher(path.toLocal8Bit().constData()); 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 \ +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 From e00896d6b411e8cac2301cadd9d4c046258368f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 9 Dec 2014 15:48:01 +0100 Subject: [PATCH 05/18] Fix qdbusviewer-qt5 icon --- qdbusviewer.desktop | 2 +- qt5-qttools.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 5.3.2-5 +- fix icon name in qdbusviewer-qt5.desktop + * Thu Dec 04 2014 Kevin Kofler 5.3.2-4 - system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups - F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293) From 1722cb8b8569232018ae983ec4530a7fe797d3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 9 Dec 2014 15:48:01 +0100 Subject: [PATCH 06/18] Fix qdbusviewer-qt5 icon --- qdbusviewer.desktop | 2 +- qt5-qttools.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 5.3.2-5 +- fix icon name in qdbusviewer-qt5.desktop + * Thu Dec 04 2014 Kevin Kofler 5.3.2-4 - system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups - F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293) From 60aa6d57a17d635400a0d787b869e97117c18523 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:48:54 -0600 Subject: [PATCH 07/18] Revert "Fix qdbusviewer-qt5 icon" This reverts commit e00896d6b411e8cac2301cadd9d4c046258368f2. --- qdbusviewer.desktop | 2 +- qt5-qttools.spec | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) 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 5.3.2-5 -- fix icon name in qdbusviewer-qt5.desktop - * Thu Dec 04 2014 Kevin Kofler 5.3.2-4 - system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups - F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293) From 4842e30fa00d28bd42ce1a65f8a6b28fc643745a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:48:56 -0600 Subject: [PATCH 08/18] Revert "system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups" This reverts commit aab042cb30276d58e2348f6a5e6addb390b0fafa. --- qt5-qttools.spec | 18 ++- ...-opensource-src-5.3.0-system-clucene.patch | 108 +++++++----------- 2 files changed, 49 insertions(+), 77 deletions(-) rename qttools-opensource-src-5.3.2-system-clucene.patch => qttools-opensource-src-5.3.0-system-clucene.patch (71%) 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 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 5.3.2-3 - rebuild (clucene09) diff --git a/qttools-opensource-src-5.3.2-system-clucene.patch b/qttools-opensource-src-5.3.0-system-clucene.patch similarity index 71% rename from qttools-opensource-src-5.3.2-system-clucene.patch rename to qttools-opensource-src-5.3.0-system-clucene.patch index 5a358f5..21fd880 100644 --- a/qttools-opensource-src-5.3.2-system-clucene.patch +++ b/qttools-opensource-src-5.3.0-system-clucene.patch @@ -1,7 +1,7 @@ -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 @@ +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 - @@ -126,13 +126,14 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri q +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!) ++DEFINES += LUCENE_ENABLE_REFCOUNT ++QMAKE_CXXFLAGS += -fpermissive #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 +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 @@ ** ****************************************************************************/ @@ -142,9 +143,9 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h #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 +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. // @@ -167,7 +168,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h QT_BEGIN_NAMESPACE -@@ -54,52 +44,6 @@ +@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE # define Q_CLUCENE_EXPORT Q_DECL_IMPORT #endif @@ -220,78 +221,65 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h 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 -+ - #include - #include - -@@ -59,13 +61,13 @@ +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.toLocal8Bit().constData()); ++ 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.toLocal8Bit().constData()); ++ return IndexReader::indexExists(directory.toStdString().c_str()); } QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path) -@@ -73,7 +75,7 @@ +@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader: using namespace lucene::index; QCLuceneIndexReader indexReader; - indexReader.d->reader = IndexReader::open(path); -+ indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData()); ++ indexReader.d->reader = IndexReader::open(path.toStdString().c_str()); return indexReader; } -@@ -81,25 +83,29 @@ +@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader: void QCLuceneIndexReader::unlock(const QString &path) { using namespace lucene::index; - IndexReader::unlock(path); -+ IndexReader::unlock(path.toLocal8Bit().constData()); ++ IndexReader::unlock(path.toStdString().c_str()); } 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()); ++ 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.toLocal8Bit().constData())); ++ 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.toLocal8Bit().constData())); ++ return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str())); } void QCLuceneIndexReader::close() -@@ -155,7 +161,7 @@ +@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3 void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value) { TCHAR *fieldName = QStringToTChar(field); @@ -300,48 +288,34 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt 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 -+ - #include - #include - -@@ -50,7 +52,12 @@ +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, -+ // 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(), ++ d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(), 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 @@ +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.toLocal8Bit().constData()); ++ new lucene::search::IndexSearcher(path.toStdString().c_str()); 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 @@ +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 From 15efa9d2d2447dc8243a6001bb0dd002edf35fab Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:48:57 -0600 Subject: [PATCH 09/18] Revert "Revert "bootstrap"" This reverts commit 279d24ae1ffea1c86f53c3121f26978b6c32e97b. --- qt5-qttools.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 5.3.2-3 -- rebuild (clucene09) +* Wed Dec 03 2014 Rex Dieter 5.3.2-2.1 +- bootstrap * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From b83a7428892a460277c9063fab4d45491cb98623 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:48:58 -0600 Subject: [PATCH 10/18] Revert "bootstrap" This reverts commit d91e9dfb43024144b0d264764b0559115b1b75f5. --- qt5-qttools.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 5.3.2-2.1 -- bootstrap +* Wed Dec 03 2014 Rex Dieter 5.3.2-3 +- rebuild (clucene09) * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From 16635c3c45706683b01d552443c3a9c41c696753 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:48:58 -0600 Subject: [PATCH 11/18] Revert "rebuild (clucene09)" This reverts commit 92cef521c7b85e3447582d05687c9f509cc9c8d8. --- qt5-qttools.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 5.3.2-3 -- rebuild (clucene09) - * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From b91848f999f092340c5818ead8b89ec4310d1b37 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:52:01 -0600 Subject: [PATCH 12/18] Revert "Fix qdbusviewer-qt5 icon" This reverts commit 1722cb8b8569232018ae983ec4530a7fe797d3d8. --- qdbusviewer.desktop | 2 +- qt5-qttools.spec | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) 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 5.3.2-5 -- fix icon name in qdbusviewer-qt5.desktop - * Thu Dec 04 2014 Kevin Kofler 5.3.2-4 - system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups - F20+/EL7+: BR reference-counting-enabled clucene09 (#1128293) From c4abe2a74a433c8cd6cae6c908fd2efe8116d66c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:52:02 -0600 Subject: [PATCH 13/18] Revert "system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups" This reverts commit aab042cb30276d58e2348f6a5e6addb390b0fafa. --- qt5-qttools.spec | 18 ++- ...-opensource-src-5.3.0-system-clucene.patch | 108 +++++++----------- 2 files changed, 49 insertions(+), 77 deletions(-) rename qttools-opensource-src-5.3.2-system-clucene.patch => qttools-opensource-src-5.3.0-system-clucene.patch (71%) 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 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 5.3.2-3 - rebuild (clucene09) diff --git a/qttools-opensource-src-5.3.2-system-clucene.patch b/qttools-opensource-src-5.3.0-system-clucene.patch similarity index 71% rename from qttools-opensource-src-5.3.2-system-clucene.patch rename to qttools-opensource-src-5.3.0-system-clucene.patch index 5a358f5..21fd880 100644 --- a/qttools-opensource-src-5.3.2-system-clucene.patch +++ b/qttools-opensource-src-5.3.0-system-clucene.patch @@ -1,7 +1,7 @@ -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 @@ +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 - @@ -126,13 +126,14 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri q +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!) ++DEFINES += LUCENE_ENABLE_REFCOUNT ++QMAKE_CXXFLAGS += -fpermissive #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 +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 @@ ** ****************************************************************************/ @@ -142,9 +143,9 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h #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 +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. // @@ -167,7 +168,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h QT_BEGIN_NAMESPACE -@@ -54,52 +44,6 @@ +@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE # define Q_CLUCENE_EXPORT Q_DECL_IMPORT #endif @@ -220,78 +221,65 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h 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 -+ - #include - #include - -@@ -59,13 +61,13 @@ +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.toLocal8Bit().constData()); ++ 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.toLocal8Bit().constData()); ++ return IndexReader::indexExists(directory.toStdString().c_str()); } QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path) -@@ -73,7 +75,7 @@ +@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader: using namespace lucene::index; QCLuceneIndexReader indexReader; - indexReader.d->reader = IndexReader::open(path); -+ indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData()); ++ indexReader.d->reader = IndexReader::open(path.toStdString().c_str()); return indexReader; } -@@ -81,25 +83,29 @@ +@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader: void QCLuceneIndexReader::unlock(const QString &path) { using namespace lucene::index; - IndexReader::unlock(path); -+ IndexReader::unlock(path.toLocal8Bit().constData()); ++ IndexReader::unlock(path.toStdString().c_str()); } 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()); ++ 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.toLocal8Bit().constData())); ++ 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.toLocal8Bit().constData())); ++ return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str())); } void QCLuceneIndexReader::close() -@@ -155,7 +161,7 @@ +@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3 void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value) { TCHAR *fieldName = QStringToTChar(field); @@ -300,48 +288,34 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt 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 -+ - #include - #include - -@@ -50,7 +52,12 @@ +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, -+ // 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(), ++ d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(), 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 @@ +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.toLocal8Bit().constData()); ++ new lucene::search::IndexSearcher(path.toStdString().c_str()); 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 @@ +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 From 896b4094b915d6fc4ccca1c8a9e057e8cd0a2a9a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:52:03 -0600 Subject: [PATCH 14/18] Revert "Revert "bootstrap"" This reverts commit 279d24ae1ffea1c86f53c3121f26978b6c32e97b. --- qt5-qttools.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 5.3.2-3 -- rebuild (clucene09) +* Wed Dec 03 2014 Rex Dieter 5.3.2-2.1 +- bootstrap * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From c0179deafd6e73b9c51ecc0714134b81e30a1ded Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:52:04 -0600 Subject: [PATCH 15/18] Revert "bootstrap" This reverts commit d91e9dfb43024144b0d264764b0559115b1b75f5. --- qt5-qttools.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 5.3.2-2.1 -- bootstrap +* Wed Dec 03 2014 Rex Dieter 5.3.2-3 +- rebuild (clucene09) * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From 0d06dc97d43aa5fd585ed04ed9c67a72a584b0fb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 06:52:04 -0600 Subject: [PATCH 16/18] Revert "rebuild (clucene09)" This reverts commit 92cef521c7b85e3447582d05687c9f509cc9c8d8. --- qt5-qttools.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 5.3.2-3 -- rebuild (clucene09) - * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit From c83305c60b9fee84499034bfabea62d5b3d05209 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Feb 2015 12:45:30 -0600 Subject: [PATCH 17/18] rebuild (gcc5) --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 - 5.4.0-2 +- rebuild (gcc5) + * Wed Dec 10 2014 Rex Dieter 5.4.0-1 - 5.4.0 (final) From e4d350f2358db8ce0c50fbb0b27d6ac32d47ccac Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 24 Feb 2015 17:31:31 +0100 Subject: [PATCH 18/18] Update to 5.4.1 --- .gitignore | 1 + qt5-qttools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) 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 5.4.1-1 +- 5.4.1 + * Thu Feb 19 2015 Rex Dieter - 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