Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
f7bc28b38e
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -1,3 +1,8 @@
|
|||
/qttools-everywhere-src-5.10.1.tar.xz
|
||||
/qttools-everywhere-src-5.11.0.tar.xz
|
||||
/qttools-everywhere-src-5.11.1.tar.xz
|
||||
/qttools-everywhere-src-5.11.2.tar.xz
|
||||
/qttools-everywhere-src-5.11.3.tar.xz
|
||||
/qttools-everywhere-src-5.12.1.tar.xz
|
||||
/qttools-everywhere-src-5.12.3.tar.xz
|
||||
/qttools-everywhere-src-5.12.4.tar.xz
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
Summary: Qt5 - QtTool components
|
||||
Name: qt5-qttools
|
||||
Version: 5.11.1
|
||||
Release: 1.0.riscv64%{?dist}
|
||||
Version: 5.12.4
|
||||
Release: 2.0.riscv64%{?dist}
|
||||
|
||||
License: LGPLv3 or LGPLv2
|
||||
Url: http://www.qt.io
|
||||
|
|
@ -41,15 +41,19 @@ BuildRequires: qt5-rpm-macros >= %{version}
|
|||
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
BuildRequires: qt5-qtbase-static >= %{version}
|
||||
BuildRequires: qt5-qtdeclarative-static >= %{version}
|
||||
BuildRequires: pkgconfig(Qt5Qml)
|
||||
# libQt5DBus.so.5(Qt_5_PRIVATE_API)
|
||||
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
||||
%if ! 0%{?bootstrap}
|
||||
|
||||
%if 0%{?bootstrap}
|
||||
%global no_examples CONFIG-=compile_examples
|
||||
Obsoletes: %{name}-examples < %{version}-%{release}
|
||||
%else
|
||||
# for qdoc
|
||||
%ifnarch riscv64
|
||||
BuildRequires: clang-devel llvm-devel
|
||||
%endif
|
||||
BuildRequires: qt5-qtdeclarative-static >= %{version}
|
||||
BuildRequires: pkgconfig(Qt5Qml)
|
||||
%endif
|
||||
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
|
|
@ -171,7 +175,8 @@ Requires: %{name}-common = %{version}-%{release}
|
|||
|
||||
|
||||
%build
|
||||
%{qmake_qt5}
|
||||
%{qmake_qt5} \
|
||||
%{?no_examples}
|
||||
|
||||
%make_build
|
||||
|
||||
|
|
@ -324,7 +329,9 @@ fi
|
|||
%{_bindir}/qdoc*
|
||||
%{_qt5_bindir}/qdoc*
|
||||
%endif
|
||||
%{_bindir}/qdistancefieldgenerator*
|
||||
%{_bindir}/qhelpgenerator*
|
||||
%{_qt5_bindir}/qdistancefieldgenerator*
|
||||
%{_qt5_bindir}/qhelpgenerator*
|
||||
%{_bindir}/qtattributionsscanner-qt5
|
||||
%{_qt5_bindir}/qtattributionsscanner*
|
||||
|
|
@ -413,13 +420,13 @@ fi
|
|||
%files devel
|
||||
%{_bindir}/pixeltool*
|
||||
%{_bindir}/qcollectiongenerator*
|
||||
%{_bindir}/qhelpconverter*
|
||||
#{_bindir}/qhelpconverter*
|
||||
%{_bindir}/qtdiag*
|
||||
%{_bindir}/qtplugininfo*
|
||||
%{_qt5_bindir}/pixeltool*
|
||||
%{_qt5_bindir}/qtdiag*
|
||||
%{_qt5_bindir}/qcollectiongenerator*
|
||||
%{_qt5_bindir}/qhelpconverter*
|
||||
#{_qt5_bindir}/qhelpconverter*
|
||||
%{_qt5_bindir}/qtplugininfo*
|
||||
%{_qt5_headerdir}/QtDesigner/
|
||||
%{_qt5_headerdir}/QtDesignerComponents/
|
||||
|
|
@ -451,17 +458,44 @@ fi
|
|||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools.pri
|
||||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri
|
||||
|
||||
%if ! 0%{?no_examples:1}
|
||||
%files examples
|
||||
%{_qt5_examplesdir}/
|
||||
%{_qt5_plugindir}/designer/*
|
||||
%dir %{_qt5_libdir}/cmake/Qt5Designer
|
||||
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_*
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 21 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 5.11.1-1.0.riscv64
|
||||
* Sun Aug 18 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 5.12.4-2.0.riscv64
|
||||
- Disable clang-devel and llvm-devel for RISC-V (riscv64)
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
|
||||
- 5.12.4
|
||||
|
||||
* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
|
||||
- 5.12.3
|
||||
|
||||
* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
|
||||
- 5.12.1
|
||||
- better bootstrap support (examples)
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
|
||||
- 5.11.3
|
||||
|
||||
* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
|
||||
- 5.11.2
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jun 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
|
||||
- 5.11.1
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (qttools-everywhere-src-5.11.1.tar.xz) = cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
|
||||
SHA512 (qttools-everywhere-src-5.12.4.tar.xz) = 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
|
||||
|
|
|
|||
Loading…
Reference in New Issue