Merge branch 'master' into epel7

This commit is contained in:
Rex Dieter 2015-10-20 18:29:30 -05:00
commit 61be756e23
4 changed files with 153 additions and 77 deletions

4
.gitignore vendored
View File

@ -1,3 +1,7 @@
/qttools-opensource-src-5.4.0.tar.xz /qttools-opensource-src-5.4.0.tar.xz
/qttools-opensource-src-5.4.1.tar.xz /qttools-opensource-src-5.4.1.tar.xz
/qttools-opensource-src-5.4.2.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

View File

@ -1,5 +1,6 @@
#global bootstrap 1 #global bootstrap 1
%global qt_module qttools %global qt_module qttools
%if 0%{?fedora} > 19 || 0%{?rhel} > 6 %if 0%{?fedora} > 19 || 0%{?rhel} > 6
%global system_clucene 1 %global system_clucene 1
@ -14,25 +15,22 @@
%endif %endif
%endif %endif
## define prerelease rc1
Summary: Qt5 - QtTool components Summary: Qt5 - QtTool components
Name: qt5-qttools Name: qt5-qttools
Version: 5.4.2 Version: 5.5.1
Release: 1%{?dist} Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv3 or LGPLv2
License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io
Url: http://qt-project.org/ Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
%if 0%{?pre:1}
Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
%else
Source0: http://download.qt-project.org/official_releases/qt/5.4/%{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.2-system-clucene.patch
# help lrelease/lupdate use/prefer qmake-qt5 # help lrelease/lupdate use/prefer qmake-qt5
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
Patch2: qttools-opensource-src-5.2.0-qmake-qt5.patch Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch
## upstream patches ## upstream patches
@ -47,8 +45,8 @@ BuildRequires: cmake
%endif %endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-static >= %{version}
BuildRequires: qt5-qtdeclarative-static BuildRequires: qt5-qtdeclarative-static >= %{version}
BuildRequires: qt5-qtwebkit-devel BuildRequires: qt5-qtwebkit-devel
%if 0%{?system_clucene} %if 0%{?system_clucene}
@ -56,7 +54,8 @@ BuildRequires: clucene09-core-devel >= 0.9.21b-12
%endif %endif
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
# when -libs were split out, for multilib upgrade path # when -libs were split out, for multilib upgrade path
Obsoletes: qt5-tools < 5.4.0-0.2 Obsoletes: qt5-tools < 5.4.0-0.2
@ -78,8 +77,9 @@ Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release} Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa} Requires: qt5-qtbase-devel%{?_isa}
Provides: qt5-designer = %{version}-%{release} Requires: qt5-qhelpgenerator = %{version}-%{release}
Provides: qt5-linguist = %{version}-%{release} Requires: qt5-designer = %{version}-%{release}
Requires: qt5-linguist = %{version}-%{release}
%description devel %description devel
%{summary}. %{summary}.
@ -127,25 +127,43 @@ Requires: %{name}-common = %{version}-%{release}
%description -n qt5-assistant %description -n qt5-assistant
%{summary}. %{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 %package -n qt5-designer-plugin-webkit
Summary: Qt5 designer plugin for WebKit Summary: Qt5 designer plugin for WebKit
Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
%description -n qt5-designer-plugin-webkit %description -n qt5-designer-plugin-webkit
%{summary}. %{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 %package -n qt5-qdbusviewer
Summary: D-Bus debugger and viewer Summary: D-Bus debugger and viewer
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
%description -n qt5-qdbusviewer %description -n qt5-qdbusviewer
QDbusviewer can be used to inspect D-Bus objects of running programs QDbusviewer can be used to inspect D-Bus objects of running programs
and invoke methods on those objects. 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
%if 0%{?docs} %if 0%{?docs}
%package doc %package doc
Summary: API documentation for %{name} Summary: API documentation for %{name}
# for qhelpgenerator BuildRequires: qt5-qhelpgenerator
BuildRequires: qt5-qttools-devel
BuildArch: noarch BuildArch: noarch
%description doc %description doc
%{summary}. %{summary}.
@ -159,7 +177,7 @@ Requires: %{name}-common = %{version}-%{release}
%prep %prep
%setup -q -n qttools-opensource-src-%{version}%{?pre:-%{pre}} %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
%if 0%{?system_clucene} %if 0%{?system_clucene}
%patch1 -p1 -b .system_clucene %patch1 -p1 -b .system_clucene
@ -212,7 +230,7 @@ mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{_qt5_bindir} pushd %{buildroot}%{_qt5_bindir}
for i in * ; do for i in * ; do
case "${i}" in case "${i}" in
assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator) assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo)
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5 ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5
ln -sv ${i} ${i}-qt5 ln -sv ${i} ${i}-qt5
;; ;;
@ -257,7 +275,7 @@ popd
%{_qt5_bindir}/qtpaths %{_qt5_bindir}/qtpaths
%files common %files common
%doc LGPL_EXCEPTION.txt LICENSE.LGPL* %doc LICENSE.LGPL*
%post libs-clucene -p /sbin/ldconfig %post libs-clucene -p /sbin/ldconfig
%postun libs-clucene -p /sbin/ldconfig %postun libs-clucene -p /sbin/ldconfig
@ -298,10 +316,73 @@ fi
%{_datadir}/applications/*assistant.desktop %{_datadir}/applications/*assistant.desktop
%{_datadir}/icons/hicolor/*/apps/assistant*.* %{_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*.*
# example designer plugins
%{_qt5_plugindir}/designer/libcontainerextension.so
%{_qt5_plugindir}/designer/libcustomwidgetplugin.so
%{_qt5_plugindir}/designer/libtaskmenuextension.so
%{_qt5_plugindir}/designer/libworldtimeclockplugin.so
%{_qt5_plugindir}/designer/libqquickwidget.so
%dir %{_qt5_libdir}/cmake/Qt5Designer/
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake
%files -n qt5-designer-plugin-webkit %files -n qt5-designer-plugin-webkit
%{_qt5_plugindir}/designer/libqwebview.so %{_qt5_plugindir}/designer/libqwebview.so
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
%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 %post -n qt5-qdbusviewer
touch --no-create %{_datadir}/icons/hicolor ||: touch --no-create %{_datadir}/icons/hicolor ||:
@ -320,46 +401,26 @@ fi
%{_datadir}/applications/*qdbusviewer.desktop %{_datadir}/applications/*qdbusviewer.desktop
%{_datadir}/icons/hicolor/*/apps/qdbusviewer*.* %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
%post devel %files -n qt5-qhelpgenerator
touch --no-create %{_datadir}/icons/hicolor ||: %{_bindir}/qhelpgenerator*
%{_qt5_bindir}/qhelpgenerator*
%posttrans devel
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database -q &> /dev/null ||:
%postun devel
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
fi
%files devel %files devel
%{_bindir}/designer*
%{_bindir}/lconvert*
%{_bindir}/linguist*
%{_bindir}/lrelease*
%{_bindir}/lupdate*
%{_bindir}/pixeltool* %{_bindir}/pixeltool*
%{_bindir}/qcollectiongenerator* %{_bindir}/qcollectiongenerator*
%{_bindir}/qhelpconverter* %{_bindir}/qhelpconverter*
%{_bindir}/qhelpgenerator*
%{_bindir}/qtdiag* %{_bindir}/qtdiag*
%{_qt5_bindir}/designer* %{_bindir}/qtplugininfo*
%{_qt5_bindir}/lconvert*
%{_qt5_bindir}/linguist*
%{_qt5_bindir}/lrelease*
%{_qt5_bindir}/lupdate*
%{_qt5_bindir}/pixeltool* %{_qt5_bindir}/pixeltool*
%{_qt5_bindir}/qtdiag* %{_qt5_bindir}/qtdiag*
%{_qt5_bindir}/qcollectiongenerator* %{_qt5_bindir}/qcollectiongenerator*
%{_qt5_bindir}/qhelpconverter* %{_qt5_bindir}/qhelpconverter*
%{_qt5_bindir}/qhelpgenerator* %{_qt5_bindir}/qtplugininfo*
%{_qt5_headerdir}/QtCLucene/ %{_qt5_headerdir}/QtCLucene/
%{_qt5_headerdir}/QtDesigner/ %{_qt5_headerdir}/QtDesigner/
%{_qt5_headerdir}/QtDesignerComponents/ %{_qt5_headerdir}/QtDesignerComponents/
%{_qt5_headerdir}/QtHelp/ %{_qt5_headerdir}/QtHelp/
# phrasebooks used by linguist %{_qt5_headerdir}/QtUiPlugin
%{_qt5_datadir}/phrasebooks/
%{_qt5_libdir}/libQt5CLucene.prl %{_qt5_libdir}/libQt5CLucene.prl
%{_qt5_libdir}/libQt5CLucene.so %{_qt5_libdir}/libQt5CLucene.so
%{_qt5_libdir}/libQt5Designer*.prl %{_qt5_libdir}/libQt5Designer*.prl
@ -369,31 +430,12 @@ fi
%{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake
%dir %{_qt5_libdir}/cmake/Qt5Help/ %dir %{_qt5_libdir}/cmake/Qt5Help/
%{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake %{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake
%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/ %{_qt5_libdir}/cmake/Qt5UiPlugin/
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
%{_qt5_libdir}/pkgconfig/Qt5CLucene.pc %{_qt5_libdir}/pkgconfig/Qt5CLucene.pc
%{_qt5_libdir}/pkgconfig/Qt5Designer.pc %{_qt5_libdir}/pkgconfig/Qt5Designer.pc
%{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc %{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc
%{_qt5_libdir}/pkgconfig/Qt5Help.pc %{_qt5_libdir}/pkgconfig/Qt5Help.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri %{_qt5_archdatadir}/mkspecs/modules/*.pri
%{_datadir}/applications/*designer.desktop
%{_datadir}/applications/*linguist.desktop
%{_datadir}/icons/hicolor/*/apps/designer*.*
%{_datadir}/icons/hicolor/*/apps/linguist*.*
# example designer plugins
%{_qt5_plugindir}/designer/libcontainerextension.so
%{_qt5_plugindir}/designer/libcustomwidgetplugin.so
%{_qt5_plugindir}/designer/libtaskmenuextension.so
%{_qt5_plugindir}/designer/libworldtimeclockplugin.so
%{_qt5_plugindir}/designer/libqquickwidget.so
%dir %{_qt5_libdir}/cmake/Qt5Designer/
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake
%files static %files static
%{_qt5_headerdir}/QtUiTools/ %{_qt5_headerdir}/QtUiTools/
@ -424,6 +466,36 @@ fi
%changelog %changelog
* 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 * Wed Jun 03 2015 Jan Grulich <jgrulich@redhat.com> - 5.4.2-1
- 5.4.2 - 5.4.2

View File

@ -1,7 +1,7 @@
diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp 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.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600 --- 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.2.0-rc1/src/linguist/lrelease/main.cpp 2013-12-02 11:33:01.346611970 -0600 +++ qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp 2015-07-16 10:23:49.664773033 -0500
@@ -318,9 +318,9 @@ int main(int argc, char **argv) @@ -310,9 +310,9 @@ int main(int argc, char **argv)
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
if (option.qmake_abslocation.isEmpty()) if (option.qmake_abslocation.isEmpty())
#ifdef QT_BOOTSTRAPPED #ifdef QT_BOOTSTRAPPED
@ -13,10 +13,10 @@ diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-q
#endif #endif
option.initProperties(); option.initProperties();
QMakeVfs vfs; QMakeVfs vfs;
diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp 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.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600 --- 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.2.0-rc1/src/linguist/lupdate/main.cpp 2013-12-02 11:33:01.347611960 -0600 +++ qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp 2015-07-16 10:23:49.665773055 -0500
@@ -1070,7 +1070,7 @@ int main(int argc, char **argv) @@ -1048,7 +1048,7 @@ int main(int argc, char **argv)
ProFileGlobals option; ProFileGlobals option;
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
if (option.qmake_abslocation.isEmpty()) if (option.qmake_abslocation.isEmpty())

View File

@ -1 +1 @@
2949a16131b54169119d1a14b891a10b qttools-opensource-src-5.4.2.tar.xz 535ff9df9d83e9bde08ee3913b751d07 qttools-opensource-src-5.5.1.tar.xz