From e55f815d8db0dc6757b3281f71d3dd484f25ce8c Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 6 Jan 2025 09:54:29 +0300 Subject: [PATCH] import qt5-doc-5.15.1-9.el10 --- .gitignore | 2 +- .qt5-doc.metadata | 2 +- SOURCES/generate-qt-doc.sh | 12 +-- SPECS/qt5-doc.spec | 173 ++++++++++++++++++++++++++++--------- 4 files changed, 139 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 5d02eb4..f6d28ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qt-doc-opensource-src-5.15.9.tar.xz +SOURCES/qt-doc-opensource-src-5.15.1.tar.xz diff --git a/.qt5-doc.metadata b/.qt5-doc.metadata index 6241c84..ca87be0 100644 --- a/.qt5-doc.metadata +++ b/.qt5-doc.metadata @@ -1 +1 @@ -587e92e1ec2fd4cd07a576a1308966b08d2935e1 SOURCES/qt-doc-opensource-src-5.15.9.tar.xz +ca8072ac9185f28754a38e81e03fc3c2c0bf8206 SOURCES/qt-doc-opensource-src-5.15.1.tar.xz diff --git a/SOURCES/generate-qt-doc.sh b/SOURCES/generate-qt-doc.sh index 07eda37..1a3b51e 100755 --- a/SOURCES/generate-qt-doc.sh +++ b/SOURCES/generate-qt-doc.sh @@ -1,9 +1,7 @@ #!/bin/bash -x -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') - QT_BRANCH=5.15 -QT_VERSION=5.15.3 +QT_VERSION=5.15.1 make_build="$(rpm --eval %make_build)" # Clone full qt tree @@ -19,9 +17,7 @@ git submodule foreach "git fetch" git submodule foreach "git pull" # Init the base source -MODULES_LIST=$(printf ",%s" "${QT_MODULES[@]}") -MODULES_LIST=${MODULES_LIST:1} -./init-repository --module-subset=$MODULES_LIST +./init-repository # hard-code docdir for now, rpm --eval %{_qt5_docdir} yields unexpanded %{_docdir}/qt5 , wtf -- rex ./configure -confirm-license -opensource -prefix $(rpm --eval "%{_qt5_prefix}") \ @@ -34,9 +30,7 @@ MODULES_LIST=${MODULES_LIST:1} -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 qtqa -skip qtwebengine -skip qtwebview -skip qtdatavis3d \ - -skip qtgamepad -skip qtcharts -skip qtnetworkauth -skip qtremoteobjects -skip qtscxml \ - -skip qtvirtualkeyboard -skip qtspeech + -skip qtactiveqt -skip qtwinextras -skip qtqa $make_build qmake_all diff --git a/SPECS/qt5-doc.spec b/SPECS/qt5-doc.spec index 7abdee6..77435ef 100644 --- a/SPECS/qt5-doc.spec +++ b/SPECS/qt5-doc.spec @@ -1,7 +1,7 @@ Name: qt5-doc Summary: Qt5 - Complete documentation -Version: 5.15.9 -Release: 1%{?dist} +Version: 5.15.1 +Release: 9%{?dist} BuildArch: noarch License: GFDL @@ -18,8 +18,9 @@ BuildRequires: qt5-rpm-macros >= 5.5.0 Obsoletes: qt5-qtcanvas3d-doc < 5.13 -Requires: qt5-qt3d-doc >= %{version} Requires: qt5-qtbase-doc >= %{version} +Requires: qt5-qt3d-doc >= %{version} +Requires: qt5-qtcharts-doc >= %{version} Requires: qt5-qtconnectivity-doc >= %{version} Requires: qt5-qtdeclarative-doc >= %{version} Requires: qt5-qtgraphicaleffects-doc >= %{version} @@ -29,28 +30,32 @@ Requires: qt5-qtmultimedia-doc >= %{version} Requires: qt5-qtquickcontrols2-doc >= %{version} Requires: qt5-qtquickcontrols-doc >= %{version} Requires: qt5-qtscript-doc >= %{version} +Requires: qt5-qtscxml-doc >= %{version} Requires: qt5-qtsensors-doc >= %{version} Requires: qt5-qtserialbus-doc >= %{version} Requires: qt5-qtserialport-doc >= %{version} Requires: qt5-qtsvg-doc >= %{version} Requires: qt5-qttools-doc >= %{version} -Requires: qt5-qtwayland-doc >= %{version} +Requires: qt5-qtvirtualkeyboard-doc >= %{version} Requires: qt5-qtwebchannel-doc >= %{version} Requires: qt5-qtwebsockets-doc >= %{version} Requires: qt5-qtx11extras-doc >= %{version} Requires: qt5-qtxmlpatterns-doc >= %{version} +Requires: qt5-qtdatavis3d-doc >= %{version} +Requires: qt5-qtgamepad-doc >= %{version} +Requires: qt5-qtlocation-doc >= %{version} +Requires: qt5-qtwayland-doc >= %{version} +Requires: qt5-qtwebview-doc >= %{version} +Requires: qt5-qtspeech-doc >= %{version} +Requires: qt5-qtremoteobjects-doc >= %{version} +Requires: qt5-qtcharts-doc >= %{version} +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 @@ -82,6 +87,16 @@ Summary: Documentation for qt3d %files -n qt5-qt3d-doc %{_qt5_docdir}/qt3d* +%package -n qt5-qtcharts-doc +Summary: Documentation for qtcharts + +%description -n qt5-qtcharts-doc +%{summary}. + +%files -n qt5-qtcharts-doc +%{_qt5_docdir}/qtcharts* +%{_qt5_docdir}/qtlabs* + %package -n qt5-qtconnectivity-doc Summary: Documentation for qtconnectivity @@ -136,7 +151,7 @@ Summary: Documentation for qtquickcontrols2 %{summary}. %files -n qt5-qtquickcontrols2-doc -%{_qt5_docdir}/qtquickcontrols* +%{_qt5_docdir}/qtquickcontrols/ %package -n qt5-qtquickcontrols-doc Summary: Documentation for qtquickcontrols @@ -145,7 +160,7 @@ Summary: Documentation for qtquickcontrols %{summary}. %files -n qt5-qtquickcontrols-doc -%{_qt5_docdir}/qtquickcontrols1 +%{_qt5_docdir}/qtquickcontrols1/ %package -n qt5-qtscript-doc Summary: Documentation for qtscript @@ -156,6 +171,15 @@ Summary: Documentation for qtscript %files -n qt5-qtscript-doc %{_qt5_docdir}/qtscript* +%package -n qt5-qtscxml-doc +Summary: Documentation for qtscxml + +%description -n qt5-qtscxml-doc +%{summary}. + +%files -n qt5-qtscxml-doc +%{_qt5_docdir}/qtscxml* + %package -n qt5-qtsensors-doc Summary: Documentation for qtsensors @@ -199,13 +223,22 @@ Summary: Documentation for qttools %{summary}. %files -n qt5-qttools-doc -%{_qt5_docdir}/qdoc* +#{_qt5_docdir}/qdoc* %{_qt5_docdir}/qtassistant* %{_qt5_docdir}/qtdesigner* %{_qt5_docdir}/qthelp* %{_qt5_docdir}/qtlinguist* %{_qt5_docdir}/qtuitools* +%package -n qt5-qtvirtualkeyboard-doc +Summary: Documentation for qtvirtualkeyboard + +%description -n qt5-qtvirtualkeyboard-doc +%{summary}. + +%files -n qt5-qtvirtualkeyboard-doc +%{_qt5_docdir}/qtvirtualkeyboard* + %package -n qt5-qtwebchannel-doc Summary: Documentation for qtwebchannel @@ -233,18 +266,32 @@ 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 +%package -n qt5-qtspeech-doc +Summary: Documentation for qtspeech + +%description -n qt5-qtspeech-doc +%{summary}. + +%files -n qt5-qtspeech-doc +%{_qt5_docdir}/qtspeech* + +%package -n qt5-qtremoteobjects-doc +Summary: Documentation for qtremoteobjects -%description -n qt5-qtdoc-doc +%description -n qt5-qtremoteobjects-doc %{summary}. -%files -n qt5-qtdoc-doc -%{_qt5_docdir}/qtdoc* -%endif +%files -n qt5-qtremoteobjects-doc +%{_qt5_docdir}/qtremoteobjects* + +%package -n qt5-qtpurchasing-doc +Summary: Documentation for qtpurchasing + +%description -n qt5-qtpurchasing-doc +%{summary}. + +%files -n qt5-qtpurchasing-doc +%{_qt5_docdir}/qtpurchasing* %package -n qt5-qtwayland-doc Summary: Documentation for qtwayland @@ -255,6 +302,15 @@ Summary: Documentation for qtwayland %files -n qt5-qtwayland-doc %{_qt5_docdir}/qtwayland* +%package -n qt5-qtwebview-doc +Summary: Documentation for qtwebview + +%description -n qt5-qtwebview-doc +%{summary}. + +%files -n qt5-qtwebview-doc +%{_qt5_docdir}/qtwebview* + %package -n qt5-qtlocation-doc Summary: Documentation for qtlocation @@ -274,37 +330,76 @@ Summary: Documentation for qtxmlpatterns %files -n qt5-qtxmlpatterns-doc %{_qt5_docdir}/qtxmlpatterns* +%package -n qt5-qtdatavis3d-doc +Summary: Documentation for qtdatavis3d + +%description -n qt5-qtdatavis3d-doc +%{summary}. + +%files -n qt5-qtdatavis3d-doc +%{_qt5_docdir}/qtdatavis3d* +%{_qt5_docdir}/qtdatavisualization* + +%package -n qt5-qtgamepad-doc +Summary: Documentation for qtgamepad + +%description -n qt5-qtgamepad-doc +%{summary}. + +%files -n qt5-qtgamepad-doc +%{_qt5_docdir}/qtgamepad* + + %prep # 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} + +## unpackaged files +pushd %{buildroot}%{_qt5_docdir} +rm -rfv \ + qdoc* \ + qtdistancefieldgenerator* \ + qtdoc* qtcmake* \ + qtlottieanimation* \ + qtpdf* \ + qtwebengine* -cd %{buildroot}%{_docdir}/qt5 -rm -rfv qtdoc* qtcmake* qtdistancefieldgenerator* qtlabs* +popd %changelog -* Tue Apr 18 2023 Jan Grulich - 5.15.9-1 -- 5.15.9 - Resolves: bz#2175726 +* Mon Jan 06 2025 Arkady L. Shane - 5.15.1-9 +- Rebuilt for MSVSphere 10 + +* 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 -* Fri Apr 01 2022 Jan Grulich - 5.15.3-1 -- 5.15.3 - Resolves: bz#2061353 +* Sat Jul 23 2022 Fedora Release Engineering - 5.15.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Tue Aug 10 2021 Mohan Boddu - 5.15.1-4 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Fri Jan 21 2022 Fedora Release Engineering - 5.15.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Fri Apr 16 2021 Mohan Boddu - 5.15.1-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* 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