2017-08-11: package is now included in RHEL

Merge branch 'master' into epel7
2017-08-11 21:55:38 +02:00 · 2016-06-15 08:04:15 -05:00 · 2016-03-20 17:41:13 -05:00 · 2016-03-18 15:05:25 -05:00 · 2016-03-18 15:05:03 -05:00 · 2016-03-18 12:40:40 -05:00
11 changed files with 2 additions and 1165 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,13 +0,0 @@
-/qttools-opensource-src-5.4.0.tar.xz
-/qttools-opensource-src-5.4.1.tar.xz
-/qttools-opensource-src-5.4.2.tar.xz
-/qttools-opensource-src-5.5.0-rc.tar.xz
-/qttools-opensource-src-5.5.0.tar.xz
-/qttools-opensource-src-5.5.1-rc1.tar.xz
-/qttools-opensource-src-5.5.1.tar.xz
-/qttools-opensource-src-5.6.0-beta.tar.gz
-/qttools-opensource-src-5.6.0-beta1.tar.xz
-/qttools-opensource-src-5.6.0-beta2.tar.xz
-/qttools-opensource-src-5.6.0-rc.tar.xz
-/qttools-opensource-src-5.6.0.tar.xz
-/qttools-opensource-src-5.6.1.tar.xz
--- a/assistant.desktop
+++ b/assistant.desktop
@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Assistant
-GenericName=Documentation viewer
-Comment=Shows Qt5 documentation and examples
-Exec=assistant-qt5
-Icon=assistant-qt5
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation;
--- a/dead.package
+++ b/dead.package
@ -0,0 +1,2 @@
+2017-08-11: package is now included in RHEL
+
--- a/designer.desktop
+++ b/designer.desktop
@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=designer-qt5
-Icon=designer-qt5
-MimeType=application/x-designer;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
--- a/linguist.desktop
+++ b/linguist.desktop
@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Linguist
-GenericName=Translation tool
-Comment=Add translations to Qt5 applications
-Exec=linguist-qt5
-Icon=linguist-qt5
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
--- a/qdbusviewer.desktop
+++ b/qdbusviewer.desktop
@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt5 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=qdbusviewer-qt5
-Icon=qdbusviewer-qt5
-Terminal=false
-Type=Application
-Categories=Qt;Development;Debugger;
-
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@ -1,722 +0,0 @@
-%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
-# only primary archs (for now), allow secondary to bootstrap
-%if ! 0%{?bootstrap}
-%ifarch %{arm} %{ix86} x86_64
-%define docs 1
-%endif
-%endif
-
-#define prerelease
-
-Summary: Qt5 - QtTool components
-Name:    qt5-qttools
-Version: 5.6.1
-Release: 2%{?prerelease:.%{prerelease}}%{?dist}
-
-License: LGPLv3 or LGPLv2
-Url:     http://www.qt.io
-Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
-
-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
-Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch
-
-# workaround https://bugreports.qt-project.org/browse/QTBUG-43057
-# 'make docs' crash on el6, use qSort instead of std::sort
-Patch3: qttools-opensource-src-5.6-QTBUG-43057.patch
-
-## upstream patches
-
-Source20: assistant.desktop
-Source21: designer.desktop
-Source22: linguist.desktop
-Source23: qdbusviewer.desktop
-
-# %%check needs cmake (and don't want to mess with cmake28)
-%if 0%{?fedora} || 0%{?rhel} > 6
-BuildRequires: cmake
-%endif
-BuildRequires: desktop-file-utils
-## optional (and deprecated), include in bootstrapping only for now
-%if ! 0%{?bootstrap}
-BuildRequires: pkgconfig(Qt5WebKit)
-%global webkit 1
-%endif
-BuildRequires: qt5-qtbase-static >= %{version}
-BuildRequires: qt5-qtdeclarative-static >= %{version}
-
-%if 0%{?system_clucene}
-BuildRequires: clucene09-core-devel >= 0.9.21b-12
-%endif
-
-Requires: %{name}-common = %{version}-%{release}
-
-%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
-
-# when -libs were split out, for multilib upgrade path
-Obsoletes: qt5-tools < 5.4.0-0.2
-
-%description
-%{summary}.
-
-%package common
-Summary: Common files for %{name}
-BuildArch: noarch
-%description common
-%{summary}.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs-clucene%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
-Requires: qt5-qtbase-devel%{?_isa}
-Requires: qt5-qdoc = %{version}-%{release}
-Requires: qt5-qhelpgenerator = %{version}-%{release}
-Requires: qt5-designer = %{version}-%{release}
-Requires: qt5-linguist = %{version}-%{release}
-%description devel
-%{summary}.
-
-%package static
-Summary: Static library files for %{name}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-%description static
-%{summary}.
-
-%package libs-clucene
-Summary: Qt5 CLucene runtime library
-Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
-%description libs-clucene
-%{summary}.
-
-%package libs-designer
-Summary: Qt5 Designer runtime library
-Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
-%description libs-designer
-%{summary}.
-
-%package libs-designercomponents
-Summary: Qt5 Designer Components runtime library
-Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
-%description libs-designercomponents
-%{summary}.
-
-%package libs-help
-Summary: Qt5 Help runtime library
-Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
-%description libs-help
-%{summary}.
-
-%package -n qt5-assistant
-Summary: Documentation browser for Qt5
-Requires: %{name}-common = %{version}-%{release}
-%description -n qt5-assistant
-%{summary}.
-
-%package -n qt5-designer
-Summary: Design GUIs for Qt5 applications
-Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
-%description -n qt5-designer
-%{summary}.
-
-%package -n qt5-designer-plugin-webkit
-Summary: Qt5 designer plugin for WebKit
-Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
-%description -n qt5-designer-plugin-webkit
-%{summary}.
-
-%package -n qt5-linguist
-Summary: Qt5 Linguist Tools
-Requires: %{name}-common = %{version}-%{release}
-%description -n qt5-linguist
-Tools to add translations to Qt5 applications.
-
-%package -n qt5-qdbusviewer
-Summary: D-Bus debugger and viewer
-Requires: %{name}-common = %{version}-%{release}
-%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
-%description -n qt5-qdbusviewer
-QDbusviewer can be used to inspect D-Bus objects of running programs
-and invoke methods on those objects.
-
-%package -n qt5-qhelpgenerator
-Summary: Qt5 Help generator tool
-Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
-%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
-%description -n qt5-qhelpgenerator
-
-%package -n qt5-qdoc
-Summary: Qt5 documentation generator
-Requires: %{name}%{?_isa} = %{version}-%{release}
-%description -n qt5-qdoc
-%{summary}.
-
-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-BuildArch: noarch
-Conflicts: qt5-qtbase-doc < 5.6.0
-
-%description doc
-%{summary}.
-%endif
-
-%package examples
-Summary: Programming examples for %{name}
-Requires: %{name}-common = %{version}-%{release}
-%description examples
-%{summary}.
-
-
-%prep
-%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
-
-%if 0%{?system_clucene}
-%patch1 -p1 -b .system_clucene
-# bundled libs
-rm -rf src/assistant/3rdparty/clucene
-%endif
-%patch2 -p1 -b .qmake-qt5
-%patch3 -p1 -b .QTBUG-43057
-
-
-%build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{qmake_qt5} ..
-
-make %{?_smp_mflags}
-
-%if 0%{?docs}
-make %{?_smp_mflags} docs
-%endif
-popd
-
-
-%install
-make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
-
-# Add desktop files, --vendor=qt4 helps avoid possible conflicts with qt3/qt4
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applications \
-  --vendor="qt5" \
-  %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23}
-
-# icons
-install -m644 -p -D src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant-qt5.png
-install -m644 -p -D src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant-qt5.png
-install -m644 -p -D src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/designer-qt5.png
-install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer-qt5.png
-install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
-# linguist icons
-for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
-  size=$(echo $(basename ${icon}) | cut -d- -f2)
-  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist-qt5.png
-done
-
-# hardlink files to %{_bindir}, add -qt5 postfix to not conflict
-mkdir %{buildroot}%{_bindir}
-pushd %{buildroot}%{_qt5_bindir}
-for i in * ; do
-  case "${i}" in
-   assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo)
-      ln -v  ${i} %{buildroot}%{_bindir}/${i}-qt5
-      ln -sv ${i} ${i}-qt5
-      ;;
-    *)
-      ln -v  ${i} %{buildroot}%{_bindir}/${i}
-      ;;
-  esac
-done
-popd
-
-## .prl/.la file love
-# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
-pushd %{buildroot}%{_qt5_libdir}
-for prl_file in libQt5*.prl ; do
-  sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
-  if [ -f "$(basename ${prl_file} .prl).so" ]; then
-    rm -fv "$(basename ${prl_file} .prl).la"
-    sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
-  fi
-done
-popd
-
-## Qt5Designer.pc references non-existent Qt5UiPlugin.pc, remove the reference for now
-sed -i -e 's| Qt5UiPlugin||g' %{buildroot}%{_qt5_libdir}/pkgconfig/Qt5Designer.pc
-
-
-## work-in-progress... -- rex
-%if 0%{?fedora} || 0%{?rhel} > 6
-%check
-# verify validity of Qt5Designer.pc
-export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
-pkg-config --print-requires --print-requires-private Qt5Designer
-export CMAKE_PREFIX_PATH=%{buildroot}%{_qt5_prefix}:%{buildroot}%{_prefix}
-export PATH=%{buildroot}%{_qt5_bindir}:%{_qt5_bindir}:$PATH
-export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir}
-mkdir tests/auto/cmake/%{_target_platform}
-pushd tests/auto/cmake/%{_target_platform}
-cmake ..
-ctest --output-on-failure ||:
-popd
-%endif
-
-
-%files
-%{_bindir}/qdbus-qt5
-%{_bindir}/qtpaths
-%{_qt5_bindir}/qdbus
-%{_qt5_bindir}/qdbus-qt5
-%{_qt5_bindir}/qtpaths
-
-%files common
-%license LICENSE.LGPL*
-
-%post   libs-clucene -p /sbin/ldconfig
-%postun libs-clucene -p /sbin/ldconfig
-%files  libs-clucene
-%{_qt5_libdir}/libQt5CLucene.so.5*
-
-%post   libs-designer -p /sbin/ldconfig
-%postun libs-designer -p /sbin/ldconfig
-%files  libs-designer
-%{_qt5_libdir}/libQt5Designer.so.5*
-%dir %{_qt5_libdir}/cmake/Qt5Designer/
-
-%post   libs-designercomponents -p /sbin/ldconfig
-%postun libs-designercomponents -p /sbin/ldconfig
-%files  libs-designercomponents
-%{_qt5_libdir}/libQt5DesignerComponents.so.5*
-
-%post   libs-help -p /sbin/ldconfig
-%postun libs-help -p /sbin/ldconfig
-%files  libs-help
-%{_qt5_libdir}/libQt5Help.so.5*
-
-%post -n qt5-assistant
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-assistant
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun -n qt5-assistant
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
-%files -n qt5-assistant
-%{_bindir}/assistant-qt5
-%{_qt5_bindir}/assistant*
-%{_datadir}/applications/*assistant.desktop
-%{_datadir}/icons/hicolor/*/apps/assistant*.*
-
-%post -n qt5-designer
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-designer
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
-
-%postun -n qt5-designer
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
-%files -n qt5-designer
-%{_bindir}/designer*
-%{_qt5_bindir}/designer*
-%{_datadir}/applications/*designer.desktop
-%{_datadir}/icons/hicolor/*/apps/designer*.*
-%dir %{_qt5_libdir}/cmake/Qt5Designer/
-%{_qt5_plugindir}/designer/libqquickwidget.so
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
-%{_qt5_plugindir}/designer/libcontainerextension.so
-%{_qt5_plugindir}/designer/libcustomwidgetplugin.so
-%{_qt5_plugindir}/designer/libtaskmenuextension.so
-%{_qt5_plugindir}/designer/libworldtimeclockplugin.so
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake
-
-%if 0%{?webkit}
-%files -n qt5-designer-plugin-webkit
-%{_qt5_plugindir}/designer/libqwebview.so
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
-%endif
-
-%post -n qt5-linguist
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-linguist
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
-
-%postun -n qt5-linguist
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
-%files -n qt5-linguist
-%{_bindir}/linguist*
-%{_qt5_bindir}/linguist*
-# phrasebooks used by linguist
-%{_qt5_datadir}/phrasebooks/
-%{_datadir}/applications/*linguist.desktop
-%{_datadir}/icons/hicolor/*/apps/linguist*.*
-# linguist friends
-%{_bindir}/lconvert*
-%{_bindir}/lrelease*
-%{_bindir}/lupdate*
-%{_qt5_bindir}/lconvert*
-%{_qt5_bindir}/lrelease*
-%{_qt5_bindir}/lupdate*
-# cmake config
-%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/
-%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
-
-%post -n qt5-qdbusviewer
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-qdbusviewer
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun -n qt5-qdbusviewer
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
-%files -n qt5-qdbusviewer
-%{_bindir}/qdbusviewer*
-%{_qt5_bindir}/qdbusviewer*
-%{_datadir}/applications/*qdbusviewer.desktop
-%{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
-
-%files -n qt5-qdoc
-%{_bindir}/qdoc*
-%{_qt5_bindir}/qdoc*
-
-%files -n qt5-qhelpgenerator
-%{_bindir}/qhelpgenerator*
-%{_qt5_bindir}/qhelpgenerator*
-
-%files devel
-%{_bindir}/pixeltool*
-%{_bindir}/qcollectiongenerator*
-%{_bindir}/qhelpconverter*
-%{_bindir}/qtdiag*
-%{_bindir}/qtplugininfo*
-%{_qt5_bindir}/pixeltool*
-%{_qt5_bindir}/qtdiag*
-%{_qt5_bindir}/qcollectiongenerator*
-%{_qt5_bindir}/qhelpconverter*
-%{_qt5_bindir}/qtplugininfo*
-%{_qt5_headerdir}/QtCLucene/
-%{_qt5_headerdir}/QtDesigner/
-%{_qt5_headerdir}/QtDesignerComponents/
-%{_qt5_headerdir}/QtHelp/
-%{_qt5_headerdir}/QtUiPlugin
-%{_qt5_libdir}/libQt5CLucene.prl
-%{_qt5_libdir}/libQt5CLucene.so
-%{_qt5_libdir}/libQt5Designer*.prl
-%{_qt5_libdir}/libQt5Designer*.so
-%{_qt5_libdir}/libQt5Help.prl
-%{_qt5_libdir}/libQt5Help.so
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake
-%dir %{_qt5_libdir}/cmake/Qt5Help/
-%{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5UiPlugin/
-%{_qt5_libdir}/pkgconfig/Qt5Designer.pc
-%{_qt5_libdir}/pkgconfig/Qt5Help.pc
-%{_qt5_archdatadir}/mkspecs/modules/*.pri
-
-%files static
-%{_qt5_headerdir}/QtUiTools/
-%{_qt5_libdir}/libQt5UiTools.*a
-%{_qt5_libdir}/libQt5UiTools.prl
-%{_qt5_libdir}/cmake/Qt5UiTools/
-%{_qt5_libdir}/pkgconfig/Qt5UiTools.pc
-
-%if 0%{?docs}
-%files doc
-%license LICENSE.FDL
-%{_qt5_docdir}/qtassistant.qch
-%{_qt5_docdir}/qtassistant/
-%{_qt5_docdir}/qtdesigner.qch
-%{_qt5_docdir}/qtdesigner/
-%{_qt5_docdir}/qdoc.qch
-%{_qt5_docdir}/qdoc/
-%{_qt5_docdir}/qthelp.qch
-%{_qt5_docdir}/qthelp/
-%{_qt5_docdir}/qtlinguist.qch
-%{_qt5_docdir}/qtlinguist/
-%{_qt5_docdir}/qtuitools.qch
-%{_qt5_docdir}/qtuitools/
-%endif
-
-%files examples
-%{_qt5_examplesdir}/
-
-
-%changelog
-* Fri Jun 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2
- drop BR: double-conversion (fix qtdeclarative instead)
-
-* Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
- Update to 5.6.1
-
-* Sun Mar 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-3
- rebuild
-
-* Fri Mar 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-2
- rebuild
-
-* Wed Mar 16 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-2
- 5.6.0 final release
-
-* Mon Mar 14 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-1
- 5.6.0 final release
-
-* Tue Feb 23 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.12.rc
- Update to final RC
-
-* Fri Feb 19 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.11.rc
- workaround Qt5Designer.pc reference to non-existent Qt5UiPlugin.pc
-
-* Mon Feb 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.10
- Update RC release
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-0.9.rc
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sun Jan 17 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.8.rc
- port QTBUG-43057 workaround
-
-* Mon Dec 28 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.7.rc
- update source URL, use %%license
-
-* Mon Dec 21 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.6
- Update to final rc release
-
-* Fri Dec 11 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-0.5
- (re)fix bootstrap macro
- include qt5-qdoc/qt5-qhelpgenerator build dep deps in -doc subpkg only
- fix whitespace
-
-* Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.4
- Official rc release
-
-* Tue Dec 08 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-3
- Reenable examples. Some interfaces marked as examples are needed from phonon
- Update to second rc snapshot
-
-* Sun Dec 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.2
- de-bootstrap
-
-* Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1
- Start to implement 5.6.0 rc, bootstrapped
-
-* Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2
- Update to final release 5.5.1
-
-* Tue Sep 29 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-1
- Update to Qt 5.5.1 RC1
-
-* Sat Aug 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-4
- qt5-linguist: move lconvert,lrelease,lupdate, cmake Qt5LinguistTools  here
-
-* Wed Jul 29 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-3
- de-bootstrap
-
-* Thu Jul 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-2
- qt5-designer, qt5-linguist, qt5-qhelpgenerator subpkgs
-
-* Wed Jul 1 2015 Helio Chissini de Castro <helio@kde.org> 5.5.0-1
- New final upstream release Qt 5.5.0
-
-* Mon Jun 29 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.4.rc
- Second round of builds now with bootstrap enabled due new qttools
-
-* Sat Jun 27 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.3.rc
- Disable bootstrap
-
-* Thu Jun 25 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.2.rc
- Update for official RC1 released packages
-
-* Mon Jun 15 2015 Daniel Vrátil <dvratil@redhat.com> - 5.5.0-0.1.rc
- Qt 5.5.0 RC1
-
-* Wed Jun 03 2015 Jan Grulich <jgrulich@redhat.com> - 5.4.2-1
- 5.4.2
-
-* Sat May 02 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-3
- rebuild (gcc5)
-
-* Fri Feb 27 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.1-2
- rebuild (gcc5)
-
-* Tue Feb 24 2015 Jan Grulich <jgrulich@redhat.com> 5.4.1-1
- 5.4.1
-
-* Thu Feb 19 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.0-2
- rebuild (gcc5)
-
-* Wed Dec 10 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-1
- 5.4.0 (final)
-
-* Tue Dec 09 2014 Daniel Vrátil <dvratil@redhat.com> 5.4.0-0.10.rc
- fix icon name in qdbusviewer-qt5.desktop
-
-* Sun Nov 30 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.4.0-0.9.rc
- install Linguist icon as linguist-qt5.png, fixes file conflict (#1169127)
-
-* Fri Nov 28 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.8.rc
- 5.4.0-rc
-
-* Mon Nov 03 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.7.rc
- out-of-tree build, use %%qmake_qt5
-
-* Fri Oct 31 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.6.rc
- respin system-clucene.patch
-
-* Sun Oct 26 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.4.0-0.5.rc
- system-clucene patch: create path recursively in QtCLucene, CLucene can't
-
-* Sun Oct 26 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.4.0-0.4.rc
- disable bootstrap (reenable -doc)
- system-clucene patch: drop -fpermissive flag
- system-clucene patch: use toLocal8Bit instead of toStdString
- system_clucene: BR clucene09-core-devel >= 0.9.21b-12 (-11 was broken)
-
-* Sat Oct 25 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.4.0-0.3.rc
- libQt5Designer should be in a subpackage (#1156685)
- -doc: disable(boostrap for new clucene), drop dep on main pkg
-
-* Sat Oct 25 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.4.0-0.2.rc
- BR and rebuild against reference-counting-enabled clucene09 (#1128293)
-
-* Sat Oct 18 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.1.rc
- 5.4.0-rc
-
-* Fri Oct 17 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-2
- -devel: Requires: qt5-designer-plugin-webkit
-
-* Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-1
- 5.3.2
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Tue Jun 17 2014 Jan Grulich <jgrulich@redhat.com> - 5.3.1-1
- 5.3.1
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu May 29 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.3.0-2
- restore system-clucene patch, rm the bundled copy
-
-* Wed May 21 2014 Jan Grulich <jgrulich@redhat.com> 5.3.0-1
- 5.3.0
-
-* Wed Feb 05 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-1
- 5.2.1
-
-* Mon Jan 27 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-3
- -examples subpkg
-
-* Tue Jan 14 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-2
- epel7 bootstrapped
-
-* Thu Dec 12 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-1
- 5.2.0
-
-* Mon Dec 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.10.rc1
- 5.2.0-rc1
-
-* Mon Nov 25 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.5.rc1
- enable -doc only on primary archs (allow secondary bootstrap)
-
-* Sat Nov 09 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.4.rc1
- rebuild (arm/qreal)
-
-* Thu Oct 24 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.3.rc1
- 5.2.0-rc1
-
-* Wed Oct 16 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.2.alpha
- bootstrap ppc
-
-* Tue Oct 01 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.1.alpha
- 5.2.0-alpha
- -doc subpkg
-
-* Sat Sep 21 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-6
- lupdate can't find qmake configuration file default (#1009893)
-
-* Sat Sep 21 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-4
- use upstream cmake fix(es) (QTBUG-32570, #1006254)
-
-* Wed Sep 11 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-3
- wrong path to lrelease (#1006254)
- %%check: first try
-
-* Tue Sep 10 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-2
- ExclusiveArch: %{ix86} x86_64 %{arm}
- epel-6 love
-
-* Wed Aug 28 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-1
- qttools-5.1.1
- qt5-assistant, qt5-qdbusviewer, qt5-designer-plugin-webkit subpkgs (to match qt4)
-
-* Mon Aug 19 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-4
- use system clucene09-core
-
-* Mon Apr 29 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-3
- drop deprecated Encoding= key from .desktop files
- add justification for desktop vendor usage
-
-* Fri Apr 19 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-2
- add .desktop/icons for assistant, designer, linguist, qdbusviewer
-
-* Thu Apr 11 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-1
- 5.0.2
-
-* Mon Feb 25 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.1-2
- BR: pkgconfig(zlib)
- -static subpkg
-
-* Sat Feb 23 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.1-1
- first try
-
--- a/qttools-opensource-src-5.3.2-system-clucene.patch
+++ b/qttools-opensource-src-5.3.2-system-clucene.patch
@ -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 \
--- a/qttools-opensource-src-5.5.0-qmake-qt5.patch
+++ b/qttools-opensource-src-5.5.0-qmake-qt5.patch
@ -1,27 +0,0 @@
-diff -up qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp
--- qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5	2015-06-29 15:13:45.000000000 -0500
-+++ qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp	2015-07-16 10:23:49.664773033 -0500
-@@ -310,9 +310,9 @@ int main(int argc, char **argv)
-             option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
-             if (option.qmake_abslocation.isEmpty())
- #ifdef QT_BOOTSTRAPPED
-                option.qmake_abslocation = binDir + QLatin1String("/qmake");
-+                option.qmake_abslocation = binDir + QLatin1String("/qmake-qt5");
- #else
-                option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
-+                option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5");
- #endif
-             option.initProperties();
-             QMakeVfs vfs;
-diff -up qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp
--- qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5	2015-06-29 15:13:46.000000000 -0500
-+++ qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp	2015-07-16 10:23:49.665773055 -0500
-@@ -1048,7 +1048,7 @@ int main(int argc, char **argv)
-         ProFileGlobals option;
-         option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
-         if (option.qmake_abslocation.isEmpty())
-            option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
-+            option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5");
-         option.debugLevel = proDebug;
-         option.initProperties();
-         option.setCommandLineArguments(QDir::currentPath(),
--- a/qttools-opensource-src-5.6-QTBUG-43057.patch
+++ b/qttools-opensource-src-5.6-QTBUG-43057.patch
@ -1,12 +0,0 @@
-diff -up qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp
--- qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig	2015-12-14 10:58:18.000000000 -0600
-+++ qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp	2016-01-17 20:42:45.946004310 -0600
-@@ -1531,7 +1531,7 @@ void QDocIndexFiles::generateIndexSectio
-             const Aggregate* inner = static_cast<const Aggregate*>(node);
- 
-             NodeList cnodes = inner->childNodes();
-            std::sort(cnodes.begin(), cnodes.end(), compareNodes);
-+            qSort(cnodes.begin(), cnodes.end(), compareNodes);
- 
-             foreach (Node* child, cnodes) {
-                 generateIndexSections(writer, child, generateInternalNodes);
--- a/1
+++ b/1
@ -1 +0,0 @@
-bf2cea01e94140524a3fc58c2f2ddebc  qttools-opensource-src-5.6.1.tar.xz
Author	SHA1	Message	Date
Till Maas	b460f44f27	2017-08-11: package is now included in RHEL	2017-08-11 21:55:38 +02:00
Rex Dieter	ebb3f3e1e3	Merge branch 'master' into epel7	2016-06-15 08:04:15 -05:00
Rex Dieter	260183c015	Merge branch 'master' into epel7	2016-03-20 17:41:13 -05:00
Rex Dieter	ae43f48a29	Merge branch 'f23' into epel7	2016-03-18 15:05:25 -05:00
Rex Dieter	7117cab01f	Revert "bootstrap" This reverts commit `bf5d90e53e`.	2016-03-18 15:05:03 -05:00
Rex Dieter	d254be6d2b	Merge branch 'f23' into epel7	2016-03-18 12:40:40 -05:00
Rex Dieter	bf5d90e53e	bootstrap	2016-03-18 12:40:23 -05:00
Rex Dieter	61be756e23	Merge branch 'master' into epel7	2015-10-20 18:29:30 -05:00
Rex Dieter	2ff56bcae9	Revert "5.4.2-2 (non-mergable backport)" This reverts commit `2ef1c8b169`.	2015-10-20 18:29:27 -05:00
Rex Dieter	f25e0334ad	Revert "really make qt5-qhelpgenerator subpkg (non-mergeable)" This reverts commit `616a2cb182`.	2015-10-20 18:29:26 -05:00
Rex Dieter	59d061d5be	Revert "de-bootstrap (non-mergeable)" This reverts commit `3719025380`.	2015-10-20 18:29:25 -05:00
Rex Dieter	76f140fb14	Merge branch 'f21' into epel7	2015-07-18 17:35:39 -05:00
Rex Dieter	9120c0c768	Merge branch 'f22' into f21	2015-07-18 15:58:30 -05:00
Rex Dieter	0ea826d965	Merge commit '616a2cb1820a2fc9d4334a2b88ec63e78e1dcbaf' into epel7	2015-07-18 11:50:20 -05:00
Rex Dieter	d9c8264c2e	Merge commit '616a2cb1820a2fc9d4334a2b88ec63e78e1dcbaf' into f21	2015-07-18 11:49:23 -05:00
Rex Dieter	3719025380	de-bootstrap (non-mergeable)	2015-07-18 10:12:50 -05:00
Rex Dieter	616a2cb182	really make qt5-qhelpgenerator subpkg (non-mergeable)	2015-07-18 08:49:27 -05:00
Rex Dieter	2ef1c8b169	5.4.2-2 (non-mergable backport) - qt5-designer, qt5-linguist, qt5-qhelpgenerator subpkgs	2015-07-18 08:28:31 -05:00
Jan Grulich	ffcd16409e	Merge branch 'f21' into epel7	2015-06-04 11:15:11 +02:00
Jan Grulich	ac9e3e72b2	Merge branch 'f21' into f21	2015-06-04 11:14:39 +02:00
Jan Grulich	0484945676	Merge branch 'f20'	2015-02-26 09:18:56 +01:00
Jan Grulich	8706fa173e	Merge branch 'f21'	2015-02-25 16:29:49 +01:00
Jan Grulich	c4165e6307	Merge branch 'f22' into f21	2015-02-25 16:05:24 +01:00
Rex Dieter	eb060235fa	bootstrap epel7	2014-12-11 08:12:46 -06:00
Rex Dieter	a141f9f697	Merge branch 'master' into f20	2014-12-11 06:52:09 -06:00
Rex Dieter	0d06dc97d4	Revert "rebuild (clucene09)" This reverts commit `92cef521c7`.	2014-12-11 06:52:04 -06:00
Rex Dieter	c0179deafd	Revert "bootstrap" This reverts commit `d91e9dfb43`.	2014-12-11 06:52:04 -06:00
Rex Dieter	896b4094b9	Revert "Revert "bootstrap"" This reverts commit `279d24ae1f`.	2014-12-11 06:52:03 -06:00
Rex Dieter	c4abe2a74a	Revert "system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups" This reverts commit `aab042cb30`.	2014-12-11 06:52:02 -06:00
Rex Dieter	b91848f999	Revert "Fix qdbusviewer-qt5 icon" This reverts commit `1722cb8b85`.	2014-12-11 06:52:01 -06:00
Rex Dieter	5e14dd0023	Merge branch 'master' into f21	2014-12-11 06:49:01 -06:00
Rex Dieter	16635c3c45	Revert "rebuild (clucene09)" This reverts commit `92cef521c7`.	2014-12-11 06:48:58 -06:00
Rex Dieter	b83a742889	Revert "bootstrap" This reverts commit `d91e9dfb43`.	2014-12-11 06:48:58 -06:00
Rex Dieter	15efa9d2d2	Revert "Revert "bootstrap"" This reverts commit `279d24ae1f`.	2014-12-11 06:48:57 -06:00
Rex Dieter	4842e30fa0	Revert "system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups" This reverts commit `aab042cb30`.	2014-12-11 06:48:56 -06:00
Rex Dieter	60aa6d57a1	Revert "Fix qdbusviewer-qt5 icon" This reverts commit `e00896d6b4`.	2014-12-11 06:48:54 -06:00
Dan Vrátil	1722cb8b85	Fix qdbusviewer-qt5 icon	2014-12-09 16:02:18 +01:00
Dan Vrátil	e00896d6b4	Fix qdbusviewer-qt5 icon	2014-12-09 16:01:57 +01:00
Kevin Kofler	aab042cb30	system-clucene patch fixes: some required QDir::mkpath in QtCLucene, cleanups * Thu Dec 04 2014 Kevin Kofler <Kevin@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.	2014-12-04 21:30:42 +01:00
Rex Dieter	279d24ae1f	Revert "bootstrap" This reverts commit `d91e9dfb43`.	2014-12-04 06:53:31 -06:00
Rex Dieter	d91e9dfb43	bootstrap	2014-12-03 23:16:15 -06:00
Rex Dieter	92cef521c7	rebuild (clucene09)	2014-12-03 23:03:21 -06:00
				`@ -0,0 +1,2 @@`
				`2017-08-11: package is now included in RHEL`
				`@ -1 +0,0 @@`
				`bf2cea01e94140524a3fc58c2f2ddebc qttools-opensource-src-5.6.1.tar.xz`