!9 [sync] PR-8: update to upstream version 5.15.2

Merge pull request !9 from openeuler-sync-bot/sync-pr8-master-to-openEuler-22.03-LTS-Next
update to upstream version 5.15.2
2022-01-24 08:26:37 +00:00 · 2022-01-17 15:00:10 +08:00 · 2020-09-14 11:55:36 +08:00 · 2020-09-14 11:08:53 +08:00 · 2020-05-09 20:35:41 +08:00 · 2020-05-08 15:57:40 +08:00
4 changed files with 25 additions and 11 deletions
--- a/qt5-qtdoc.spec
+++ b/qt5-qtdoc.spec
@ -2,23 +2,25 @@

 %global qt_module qtdoc

-Name:    qt5-%{qt_module}
-Version: 5.11.1
-Release: 3
-Summary: Main Qt5 Reference Documentation
-License: GFDL
-URL:     http://www.qt.io
-%global major_minor %(echo %{version} | cut -d. -f1-2)
-Source0: https://download.qt.io/official_releases/qt/%{major_minor}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+Name:          qt5-%{qt_module}
+Version:       5.15.2
+Release:       1
+Summary:       Main Qt5 Reference Documentation
+License:       GFDL
+Url:           http://www.qt.io
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0:       https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz

-BuildArch: noarch
+BuildArch:     noarch
 %global _qt5_qmake %{_bindir}/qmake-qt5

+BuildRequires: make
 BuildRequires: qt5-qtbase-devel
 BuildRequires: qt5-doctools
+BuildRequires: qt5-qtbase-doc

-Obsoletes: qt5-qtdoc-doc < 5.9.3
-Provides:  qt5-qtdoc-doc = %{version}-%{release}
+Obsoletes:     qt5-qtdoc-doc < 5.9.3
+Provides:      qt5-qtdoc-doc = %{version}-%{release}

 %description
 This package contains the main Qt Reference Documentation about
@ -41,8 +43,16 @@ make install_docs INSTALL_ROOT=%{buildroot}
 %doc LICENSE.FDL
 %{_qt5_docdir}/qtdoc.qch
 %{_qt5_docdir}/qtdoc/
+%{_qt5_docdir}/qtcmake.qch
+%{_qt5_docdir}/qtcmake/


 %changelog
+* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
+- update to upstream version 5.15.2
+
+* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-4
+- Fix Source0
+
 * Tue Nov 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.11.1-3
 - refactor qt5-doc.spec
--- a/qt5-qtdoc.yaml
+++ b/qt5-qtdoc.yaml
@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://code.qt.io/qt/qtdoc.git
+tag_prefix: "^v"
+separator: "."
--- a/qtdoc-everywhere-src-5.11.1.tar.xz
+++ b/qtdoc-everywhere-src-5.11.1.tar.xz
--- a/qtdoc-everywhere-src-5.15.2.tar.xz
+++ b/qtdoc-everywhere-src-5.15.2.tar.xz
Author	SHA1	Message	Date
openeuler-ci-bot	a3c57caf5b	!9 [sync] PR-8: update to upstream version 5.15.2 Merge pull request !9 from openeuler-sync-bot/sync-pr8-master-to-openEuler-22.03-LTS-Next	2022-01-24 08:26:37 +00:00
pei-jiankang	5394243ac5	update to upstream version 5.15.2 (cherry picked from commit dfbd96b731a597caf22cdb873e507b08b0f1713c)	2022-01-17 15:00:10 +08:00
openeuler-ci-bot	c902689dd2	!5 Fix source0 From: @kkkl12 Reviewed-by: @small_leek Signed-off-by: @small_leek	2020-09-14 11:55:36 +08:00
kkkl12	f8bfd7e416	Fix Source0	2020-09-14 11:08:53 +08:00
openeuler-ci-bot	425f0ce538	!4 add yaml file Merge pull request !4 from sugarfillet/master	2020-05-09 20:35:41 +08:00
sugarfillet	870203a852	add yaml file	2020-05-08 15:57:40 +08:00
openeuler-ci-bot	7a5f44da87	!3 回退 'Pull Request !2 : Architecture select ' Merge pull request !3 from 严志华/revert-merge-2-master	2020-01-02 10:04:47 +08:00
严志华	6dff35086d	回退 'Pull Request !2 : Architecture select '	2019-12-30 16:44:10 +08:00
openeuler-ci-bot	afb9ec6d8a	!2 Architecture select Merge pull request !2 from 严志华/master	2019-12-28 14:01:59 +08:00
yanzh_h	0348050545	Architecture select	2019-12-28 11:46:04 +08:00