import qt5-doc-5.15.3-1.el8

.gitignore

@@ -1 +1 @@
-SOURCES/qt-doc-opensource-src-5.11.1.tar.xz
+SOURCES/qt-doc-opensource-src-5.15.3.tar.xz

.qt5-doc.metadata

@@ -1 +1 @@
-c4b5db179c7ed13092de59b4ccbe6410c557c7fb SOURCES/qt-doc-opensource-src-5.11.1.tar.xz
+71c044bce298014d97e9fd5cf4e4e34df0d81c8d SOURCES/qt-doc-opensource-src-5.15.3.tar.xz

SOURCES/generate-qt-doc.sh

@@ -1,59 +1,59 @@
 #!/bin/bash -x
 
-# Clone full qt tree
-git clone -b 5.11 git://code.qt.io/qt/qt5.git
+QT_MODULES=('qt3d' 'qtbase' 'qtcanvas3d' 'qtconnectivity' 'qtdeclarative' 'qtdoc' 'qtgraphicaleffects' 'qtimageformats' 'qtlocation' 'qtmultimedia' 'qtquickcontrols' 'qtquickcontrols2' 'qtscript' 'qtsensors' 'qtserialbus' 'qtserialport' 'qtsvg' 'qttools' 'qtwayland' 'qtwebchannel' 'qtwebsockets' 'qtx11extras' 'qtxmlpatterns')
 
-# Install fedora deps for qt5-qtbase
-sudo dnf builddep qt5-qtbase
+QT_BRANCH=5.15
+QT_VERSION=5.15.3
+make_build="$(rpm --eval %make_build)"
+
+# Clone full qt tree
+git clone -b $QT_BRANCH git://code.qt.io/qt/qt5.git
+
+# Install fedora deps for qt5-qtbase, qt5-qttools
+sudo dnf builddep qt5-qtbase qt5-qttools -y
 
 # Configure using fedora configure basic options
 cd qt5 || return
-git submodule foreach "git checkout 5.11"
+git submodule foreach "git checkout $QT_BRANCH"
 git submodule foreach "git fetch"
 git submodule foreach "git pull"
 
 # Init the base source
-./init-repository
+MODULES_LIST=$(printf ",%s" "${QT_MODULES[@]}")
+MODULES_LIST=${MODULES_LIST:1}
+./init-repository --module-subset=$MODULES_LIST
 
+# hard-code docdir for now, rpm --eval %{_qt5_docdir} yields unexpanded %{_docdir}/qt5 , wtf -- rex
 ./configure -confirm-license -opensource -prefix $(rpm --eval "%{_qt5_prefix}") \
     -archdatadir $(rpm --eval "%{_qt5_archdatadir}") -bindir $(rpm --eval "%{_qt5_bindir}") \
     -libdir $(rpm --eval "%{_qt5_libdir}") -libexecdir $(rpm --eval "%{_qt5_libexecdir}") \
-    -datadir $(rpm --eval "%{_qt5_datadir}") -docdir $(rpm --eval "%{_qt5_docdir}") \
+    -datadir $(rpm --eval "%{_qt5_datadir}") -docdir /usr/share/doc/qt5 \
     -examplesdir $(rpm --eval "%{_qt5_examplesdir}") -headerdir $(rpm --eval "%{_qt5_headerdir}") \
     -importdir $(rpm --eval "%{_qt5_importdir}") -plugindir $(rpm --eval "%{_qt5_plugindir}") \
     -sysconfdir $(rpm --eval "%{_qt5_sysconfdir}") -translationdir $(rpm --eval "%{_qt5_translationdir}") \
     -platform linux-g++ -release -shared -accessibility -dbus-runtime -fontconfig -glib -gtk \
     -icu -journald -nomake examples -nomake tests -no-rpath -no-separate-debug-info -no-strip \
     -system-libjpeg -system-libpng -system-zlib -no-directfb -skip qtmacextras -skip qtandroidextras \
-    -skip qtactiveqt -skip qtwinextras
+    -skip qtactiveqt -skip qtwinextras -skip qtqa -skip qtwebengine -skip qtwebview -skip qtdatavis3d \
+    -skip qtgamepad -skip qtcharts -skip qtnetworkauth -skip qtremoteobjects -skip qtscxml \
+    -skip qtvirtualkeyboard -skip qtspeech
 
+$make_build qmake_all
 
-make qmake_all
+$make_build -C qtbase || exit
+$make_build -C qtbase/src/tools/bootstrap
+$make_build -C qtbase/src/tools/rcc
+$make_build sub-qmldevtools -C qtdeclarative/src/
+$make_build sub-qdoc sub-qtattributionsscanner -C qttools/src/
+$make_build sub-qhelpgenerator -C qttools/src/assistant/
 
-pushd qtbase
-
-make $(rpm --eval '%{_smp_mflags}') || exit
-
-popd
-
-pushd qtdeclarative/src
-    make $(rpm --eval '%{_smp_mflags}') sub-qmldevtools
-popd
-
-pushd qttools/src/
-    make $(rpm --eval '%{_smp_mflags}') sub-qdoc sub-qtattributionsscanner
-popd
-
-pushd qttools/src/assistant
-    make $(rpm --eval '%{_smp_mflags}') sub-qhelpgenerator
-popd
-
-make docs
+echo "INFO: make docs"
+$make_build -j1 docs  || echo "ERROR: make docs" ; exit 1
 
 # Install docs on tmp directory
 DEST=${PWD}/install
-mkdir -p ${DEST}
-make INSTALL_ROOT=${DEST} install_docs
+rm -rf $DEST/ && mkdir -p ${DEST}
+$make_build install_docs INSTALL_ROOT=$DEST -k
 
-cd ${DEST}
-tar cfJ ../qt-doc-opensource-src-5.11.1.tar.xz .
+XZ_OPT="-T 2"
+tar -C $DEST -cJf ../qt-doc-opensource-src-${QT_VERSION}.tar.xz .

SPECS/qt5-doc.spec

@@ -1,6 +1,6 @@
 Name:    qt5-doc
 Summary: Qt5 - Complete documentation
-Version: 5.11.1
+Version: 5.15.3
 Release: 1%{?dist}
 BuildArch: noarch
 
@@ -135,7 +135,7 @@ Summary: Documentation for qtquickcontrols2
 %{summary}.
 
 %files -n qt5-qtquickcontrols2-doc
-%{_qt5_docdir}/qtquickcontrols2*
+%{_qt5_docdir}/qtquickcontrols*
 
 %package -n qt5-qtquickcontrols-doc
 Summary: Documentation for qtquickcontrols
@@ -144,7 +144,7 @@ Summary: Documentation for qtquickcontrols
 %{summary}.
 
 %files -n qt5-qtquickcontrols-doc
-%{_qt5_docdir}/qtquickcontrols*
+%{_qt5_docdir}/qtquickcontrols1
 
 %package -n qt5-qtscript-doc
 Summary: Documentation for qtscript
@@ -285,16 +285,26 @@ mkdir -p %{buildroot}
 cd %{buildroot}
 tar xf %{SOURCE0}
 
-# Remove non used
 cd %{buildroot}%{_docdir}/qt5
-rm -rfv activeqt* qtandroidextras* qtmacextras* qtwinextras*
-rm -rfv qtdoc* qtwebview* qtwebengine* qtvirtualkeyboard* qtspeech*
-rm -rfv qtscxml* qtremoteobjects* qtpurchasing* qtlabsplatform*
-rm -rfv qtlabscalendar* qtgamepad* qtdatavisualization* qtcharts*
-rm -rfv qtdatavis3d*
-
+rm -rfv qtdoc* qtcmake* qtdistancefieldgenerator* qtlabs*
 
 %changelog
+* Fri Apr 01 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
+- 5.15.3
+  Resolves: bz#2061378
+
+* Tue Apr 13 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
+- Drop qtcmake documentation to avoid duplication with qt5-qtdoc
+  Resolves: bz#1930039
+
+* Mon Apr 05 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
+- 5.15.2
+  Resolves: bz#1930039
+
+* Thu Nov 07 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
+- 5.12.5
+  Resolves: bz#1733134
+
 * Tue Jul 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-1
 - 5.11.1