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

Update to 5.8.0

Browse Source 
- Debootstrap
This commit is contained in:
Kevin Kofler 2017-03-26 19:20:14 +02:00
parent fce87bd00a
commit b4cf117960
3 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
/qttools-opensource-src-5.6.1.tar.xz /qttools-opensource-src-5.6.1.tar.xz
/qttools-opensource-src-5.7.0.tar.xz /qttools-opensource-src-5.7.0.tar.xz
/qttools-opensource-src-5.7.1.tar.xz /qttools-opensource-src-5.7.1.tar.xz
/qttools-opensource-src-5.8.0.tar.xz

114
qt5-qttools.spec
View File

@ -1,23 +1,27 @@
%global qt_module qttools %global qt_module qttools
%if (0%{?fedora} > 19 && 0%{?fedora} < 26) || 0%{?rhel} > 6 %if 0%{?fedora} > 19 || 0%{?rhel} > 6
%global system_clucene 1 %global system_clucene 1
%endif %endif
%define bootstrap 0
# Webkit still not available
%global webkit 0
# define to build docs, need to undef this for bootstrapping # define to build docs, need to undef this for bootstrapping
# where qt5-qttools builds are not yet available, for example # where qt5-qttools builds are not yet available, for example
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%global docs 1 %global docs 1
%global webkit 1
%endif %endif
Summary: Qt5 - QtTool components Summary: Qt5 - QtTool components
Name: qt5-qttools Name: qt5-qttools
Version: 5.7.1 Version: 5.8.0
Release: 6%{?dist} Release: 3%{?dist}
License: LGPLv3 or LGPLv2 License: LGPLv3 or LGPLv2
Url: http://www.qt.io Url: http://www.qt.io
Source0: http://download.qt.io/official_releases/qt/5.7/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz Source0: http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
Patch1: qttools-opensource-src-5.3.2-system-clucene.patch Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
@ -41,8 +45,10 @@ BuildRequires: cmake
%endif %endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtbase-static >= %{version}
%if ! 0%{?bootstrap}
BuildRequires: qt5-qtdeclarative-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version}
BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Qml)
%endif
%if 0%{?system_clucene} %if 0%{?system_clucene}
BuildRequires: clucene09-core-devel >= 0.9.21b-12 BuildRequires: clucene09-core-devel >= 0.9.21b-12
@ -72,10 +78,7 @@ 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}
Requires: qt5-qdoc = %{version}-%{release} Requires: qt5-doctools = %{version}-%{release}
Requires: qt5-qhelpgenerator = %{version}-%{release}
Requires: qt5-designer = %{version}-%{release}
Requires: qt5-linguist = %{version}-%{release}
%description devel %description devel
%{summary}. %{summary}.
@ -119,9 +122,6 @@ Conflicts: qt5-tools < 5.4.0-0.2
%package -n qt5-assistant %package -n qt5-assistant
Summary: Documentation browser for Qt5 Summary: Documentation browser for Qt5
%if ! 0%{?system_clucene}
Provides: bundled(clucene09)
%endif
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
%description -n qt5-assistant %description -n qt5-assistant
%{summary}. %{summary}.
@ -156,23 +156,24 @@ Requires: %{name}-common = %{version}-%{release}
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 %package -n qt5-doctools
Summary: Qt5 Help generator tool Summary: Qt5 doc tools package
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} Provides: qt5-qdoc = %{version}
%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} Obsoletes: qt5-qdoc < 5.8.0
%description -n qt5-qhelpgenerator Provides: qt5-qhelpgenerator = %{version}
Obsoletes: qt5-qhelpgenerator < 5.8.0
Provides: qt5-qtattributionsscanner = %{version}
Obsoletes: qt5-qtattributionsscanner < 5.8.0
Requires: qt5-qtattributionsscanner = %{version}
%package -n qt5-qdoc %description -n qt5-doctools
Summary: Qt5 documentation generator
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n qt5-qdoc
%{summary}. %{summary}.
%if 0%{?docs} %if 0%{?docs}
%package doc %package doc
Summary: API documentation for %{name} Summary: API documentation for %{name}
BuildRequires: qt5-qdoc BuildRequires: qt5-doctools
BuildRequires: qt5-qhelpgenerator BuildRequires: qt5-qtbase-doc
BuildArch: noarch BuildArch: noarch
Conflicts: qt5-qtbase-doc < 5.6.0 Conflicts: qt5-qtbase-doc < 5.6.0
@ -229,7 +230,7 @@ desktop-file-install \
# icons # 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.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/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/128x128/apps/designer-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.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 install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
# linguist icons # linguist icons
@ -243,7 +244,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|qtplugininfo) assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5 ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5
ln -sv ${i} ${i}-qt5 ln -sv ${i} ${i}-qt5
;; ;;
@ -336,6 +337,26 @@ fi
%{_datadir}/applications/*assistant.desktop %{_datadir}/applications/*assistant.desktop
%{_datadir}/icons/hicolor/*/apps/assistant*.* %{_datadir}/icons/hicolor/*/apps/assistant*.*
%post -n qt5-doctools
touch --no-create %{_datadir}/icons/hicolor ||:
%posttrans -n qt5-doctools
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%postun -n qt5-doctools
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-doctools
%{_bindir}/qdoc*
%{_qt5_bindir}/qdoc*
%{_bindir}/qhelpgenerator*
%{_qt5_bindir}/qhelpgenerator*
%{_bindir}/qtattributionsscanner-qt5
%{_qt5_bindir}/qtattributionsscanner*
%post -n qt5-designer %post -n qt5-designer
touch --no-create %{_datadir}/icons/hicolor ||: touch --no-create %{_datadir}/icons/hicolor ||:
@ -354,17 +375,6 @@ fi
%{_qt5_bindir}/designer* %{_qt5_bindir}/designer*
%{_datadir}/applications/*designer.desktop %{_datadir}/applications/*designer.desktop
%{_datadir}/icons/hicolor/*/apps/designer*.* %{_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} %if 0%{?webkit}
%files -n qt5-designer-plugin-webkit %files -n qt5-designer-plugin-webkit
@ -422,13 +432,6 @@ fi
%{_datadir}/applications/*qdbusviewer.desktop %{_datadir}/applications/*qdbusviewer.desktop
%{_datadir}/icons/hicolor/*/apps/qdbusviewer*.* %{_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 %files devel
%{_bindir}/pixeltool* %{_bindir}/pixeltool*
@ -490,27 +493,24 @@ fi
%{_qt5_docdir}/qtlinguist/ %{_qt5_docdir}/qtlinguist/
%{_qt5_docdir}/qtuitools.qch %{_qt5_docdir}/qtuitools.qch
%{_qt5_docdir}/qtuitools/ %{_qt5_docdir}/qtuitools/
%endif
%files examples %files examples
%{_qt5_examplesdir}/ %{_qt5_examplesdir}/
%{_qt5_plugindir}/designer/*
%dir %{_qt5_libdir}/cmake/Qt5Designer
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_*
%endif
%changelog %changelog
* Tue Mar 21 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-6 * Mon Jan 30 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-3
- -assistant: Provides: bundled(clucene09) (f26+) - Debootstrap
* Fri Feb 17 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-5 * Fri Jan 27 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-2
- disable system_lucene on f26+ (#1424227, #1424046) - Obsolete/Provides all older qdoc/helpgenerator packages in favor of doctools
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-5 * Thu Jan 26 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Initial bootstraped 5.8.0
- Created a meta package called qt5-doctools to avoid the mess of multiple tools
* Sat Dec 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-4
- 5.7.1 dec5 snapshot
* Fri Dec 02 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-3
- Qt 5 Designer has 128x128 icon in 32x32 folder (#1400972)
* Thu Dec 01 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2 * Thu Dec 01 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2
- de-bootstrap, enable -doc/-webkit - de-bootstrap, enable -doc/-webkit

2
sources
View File

@ -1 +1 @@
SHA512 (qttools-opensource-src-5.7.1.tar.xz) = 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e SHA512 (qttools-opensource-src-5.8.0.tar.xz) = 1fd023da854340ebdbed6a23bff6bf6f42ee94e40afb5e9fdb3c34bfb2aa0a2502ebf5bcf67947b9f36b0d2b218be3dcac90acc497e57f01dfe5d5f902ba9553