diff --git a/.gitignore b/.gitignore index 9e49943..62cb475 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/qt-doc-opensource-src-5.11.1.tar.xz -/qt-doc-opensource-src-5.12.3.tar.xz +/qt-doc-opensource-src-*.tar.xz diff --git a/generate-qt-doc.sh b/generate-qt-doc.sh index b467250..1a3b51e 100755 --- a/generate-qt-doc.sh +++ b/generate-qt-doc.sh @@ -1,14 +1,14 @@ #!/bin/bash -x -QT_BRANCH=5.12 -QT_VERSION=5.12.3 +QT_BRANCH=5.15 +QT_VERSION=5.15.1 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 -sudo dnf builddep qt5-qtbase +# 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 @@ -30,21 +30,24 @@ git submodule foreach "git pull" -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 $make_build 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/ -$make_build docs +echo "INFO: make docs" +$make_build -j1 docs || echo "ERROR: make docs" ; exit 1 # Install docs on tmp directory DEST=${PWD}/install rm -rf $DEST/ && mkdir -p ${DEST} -make install_docs INSTALL_ROOT=$DEST +$make_build install_docs INSTALL_ROOT=$DEST -k XZ_OPT="-T 2" tar -C $DEST -cJf ../qt-doc-opensource-src-${QT_VERSION}.tar.xz . diff --git a/qt5-doc.spec b/qt5-doc.spec index 0dfa26c..9dd78bd 100644 --- a/qt5-doc.spec +++ b/qt5-doc.spec @@ -1,10 +1,11 @@ Name: qt5-doc Summary: Qt5 - Complete documentation -Version: 5.12.3 -Release: 1%{?dist} +Version: 5.15.16 +Release: 3%{?dist} BuildArch: noarch -License: GFDL +# Automatically converted from old format: GFDL - review is highly recommended. +License: LicenseRef-Callaway-GFDL # The tarball for this docs are self generated through provided script on SOURCES generate-qt-doc.sh Url: http://qt-project.org/ Source0: qt-doc-opensource-src-%{version}.tar.xz @@ -16,7 +17,8 @@ Source1: generate-qt-doc.sh BuildRequires: qt5-rpm-macros >= 5.5.0 -Requires: qt5-qtcanvas3d-doc >= %{version} +Obsoletes: qt5-qtcanvas3d-doc < 5.13 + Requires: qt5-qtbase-doc >= %{version} Requires: qt5-qt3d-doc >= %{version} Requires: qt5-qtcharts-doc >= %{version} @@ -37,7 +39,6 @@ Requires: qt5-qtsvg-doc >= %{version} Requires: qt5-qttools-doc >= %{version} Requires: qt5-qtvirtualkeyboard-doc >= %{version} Requires: qt5-qtwebchannel-doc >= %{version} -Requires: qt5-qtwebengine-doc >= %{version} Requires: qt5-qtwebsockets-doc >= %{version} Requires: qt5-qtx11extras-doc >= %{version} Requires: qt5-qtxmlpatterns-doc >= %{version} @@ -54,14 +55,8 @@ Requires: qt5-qtpurchasing-doc >= %{version} %description This is the meta package for all Qt library documentation -%package -n qt5-qtcanvas3d-doc -Summary: Documentation for qtcanvas3d - -%description -n qt5-qtcanvas3d-doc -%{summary}. - -%files -n qt5-qtcanvas3d-doc -%{_qt5_docdir}/qtcanvas3d* +# Empty files to produce qt5-doc package for easier installation of complete documentation +%files %package -n qt5-qtbase-doc Summary: Documentation for qtbase @@ -254,15 +249,6 @@ Summary: Documentation for qtwebchannel %files -n qt5-qtwebchannel-doc %{_qt5_docdir}/qtwebchannel* -%package -n qt5-qtwebengine-doc -Summary: Documentation for qtwebengine - -%description -n qt5-qtwebengine-doc -%{summary}. - -#files -n qt5-qtwebengine-doc -#{_qt5_docdir}/qtwebengine* - %package -n qt5-qtwebsockets-doc Summary: Documentation for qtwebsockets @@ -281,19 +267,6 @@ Summary: Documentation for qtx11extras %files -n qt5-qtx11extras-doc %{_qt5_docdir}/qtx11extras* -## omit from here, conflicts with real qt5-qtdoc -- rex -## https://bugzilla.redhat.com/show_bug.cgi?id=1520355 -%if 0 -%package -n qt5-qtdoc-doc -Summary: Documentation for qtdoc - -%description -n qt5-qtdoc-doc -%{summary}. - -%files -n qt5-qtdoc-doc -%{_qt5_docdir}/qtdoc* -%endif - %package -n qt5-qtspeech-doc Summary: Documentation for qtspeech @@ -382,22 +355,90 @@ Summary: Documentation for qtgamepad # intentionally left blank # though could be used to initially unpack (rex) + %build # intentionally left blank + %install mkdir -p %{buildroot} -cd %{buildroot} -tar xf %{SOURCE0} +tar xf %{SOURCE0} -C %{buildroot} -# Remove non used -cd %{buildroot}%{_docdir}/qt5 -rm -rfv qtdoc* -# unpackaged modules -rm -rfv qtdistancefieldgenerator* +## unpackaged files +pushd %{buildroot}%{_qt5_docdir} +rm -rfv \ + qdoc* \ + qtdistancefieldgenerator* \ + qtdoc* qtcmake* \ + qtlottieanimation* \ + qtpdf* \ + qtwebengine* + +popd %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.15.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jan 18 2025 Fedora Release Engineering - 5.15.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jan 09 2025 Zephyr Lykos - 5.15.16-1 +- 5.15.16 + +* Wed Sep 04 2024 Miroslav Suchý - 5.15.1-11 +- convert license to SPDX + +* Fri Jul 19 2024 Fedora Release Engineering - 5.15.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 5.15.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 5.15.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 5.15.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 5.15.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 5.15.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 5.15.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 5.15.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 5.15.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 10 2020 Jan Grulich - 5.15.1-1 +- 5.15.1 + +* Mon Aug 10 2020 Jan Grulich - 5.14-3 +- Produce qt5-doc package for easier installation of complete documentation + +* Wed Jul 29 2020 Fedora Release Engineering - 5.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Apr 11 2020 Rex Dieter - 5.14-1 +- 5.14 + +* Sat Apr 11 2020 Rex Dieter - 5.13-1 +- 5.13 +- Obsoletes: qt5-qtcanvas3d-doc + +* Thu Jan 30 2020 Fedora Release Engineering - 5.12.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 5.12.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Apr 19 2019 Rex Dieter - 5.12.3-1 - 5.12.3 - omit qtwebengine, now packaged separately diff --git a/sources b/sources index 774297e..e28e0e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt-doc-opensource-src-5.12.3.tar.xz) = 2bdf20ce2264accd8a9fe0da5332b81bd6656f5801af1601bfa3dc37a7fbe9c3e52c224014f028079d563d8e5a13daddc87357d56ca27c783fc171cfb663899b +SHA512 (qt-doc-opensource-src-5.15.16.tar.xz) = 19a119edcbd6602aad1421a00b9b0fc131e7beff6fda93d5776c57adf2d9e72a6916b8386ee652a41d77a6b21c72587caddcfd42886b4c68bec5b0fc86ad2912