5.15.3
side-tag: c9s-build-side-453 Resolves: bz#2061353
This commit is contained in:
Jan Grulich
parent
7f87c21ef3
commit
8eb68ce528
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/qt-doc-opensource-src-5.13.tar.xz
|
||||
/qt-doc-opensource-src-5.14.tar.xz
|
||||
/qt-doc-opensource-src-5.15.1.tar.xz
|
||||
/qt-doc-opensource-src-5.15.3.tar.xz
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
#!/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.1
|
||||
QT_VERSION=5.15.3
|
||||
make_build="$(rpm --eval %make_build)"
|
||||
|
||||
# Clone full qt tree
|
||||
@ -17,7 +19,9 @@ 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}") \
|
||||
@ -30,7 +34,9 @@ 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 qtqa
|
||||
-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
|
||||
|
||||
|
||||
146
qt5-doc.spec
146
qt5-doc.spec
@ -1,7 +1,7 @@
|
||||
Name: qt5-doc
|
||||
Summary: Qt5 - Complete documentation
|
||||
Version: 5.15.1
|
||||
Release: 4%{?dist}
|
||||
Version: 5.15.3
|
||||
Release: 1%{?dist}
|
||||
BuildArch: noarch
|
||||
|
||||
License: GFDL
|
||||
@ -18,9 +18,8 @@ BuildRequires: qt5-rpm-macros >= 5.5.0
|
||||
|
||||
Obsoletes: qt5-qtcanvas3d-doc < 5.13
|
||||
|
||||
Requires: qt5-qtbase-doc >= %{version}
|
||||
Requires: qt5-qt3d-doc >= %{version}
|
||||
Requires: qt5-qtcharts-doc >= %{version}
|
||||
Requires: qt5-qtbase-doc >= %{version}
|
||||
Requires: qt5-qtconnectivity-doc >= %{version}
|
||||
Requires: qt5-qtdeclarative-doc >= %{version}
|
||||
Requires: qt5-qtgraphicaleffects-doc >= %{version}
|
||||
@ -30,32 +29,28 @@ 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-qtvirtualkeyboard-doc >= %{version}
|
||||
Requires: qt5-qtwayland-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
|
||||
|
||||
# Empty files to produce qt5-doc package for easier installation of complete documentation
|
||||
%files
|
||||
%package -n qt5-qtcanvas3d-doc
|
||||
Summary: Documentation for qtcanvas3d
|
||||
|
||||
%description -n qt5-qtcanvas3d-doc
|
||||
%{summary}.
|
||||
|
||||
%files -n qt5-qtcanvas3d-doc
|
||||
%{_qt5_docdir}/qtcanvas3d*
|
||||
|
||||
%package -n qt5-qtbase-doc
|
||||
Summary: Documentation for qtbase
|
||||
@ -87,16 +82,6 @@ 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
|
||||
|
||||
@ -151,7 +136,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
|
||||
@ -160,7 +145,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
|
||||
@ -171,15 +156,6 @@ 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
|
||||
|
||||
@ -223,22 +199,13 @@ 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
|
||||
|
||||
@ -266,32 +233,18 @@ Summary: Documentation for qtx11extras
|
||||
%files -n qt5-qtx11extras-doc
|
||||
%{_qt5_docdir}/qtx11extras*
|
||||
|
||||
%package -n qt5-qtspeech-doc
|
||||
Summary: Documentation for qtspeech
|
||||
## 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-qtspeech-doc
|
||||
%description -n qt5-qtdoc-doc
|
||||
%{summary}.
|
||||
|
||||
%files -n qt5-qtspeech-doc
|
||||
%{_qt5_docdir}/qtspeech*
|
||||
|
||||
%package -n qt5-qtremoteobjects-doc
|
||||
Summary: Documentation for qtremoteobjects
|
||||
|
||||
%description -n qt5-qtremoteobjects-doc
|
||||
%{summary}.
|
||||
|
||||
%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*
|
||||
%files -n qt5-qtdoc-doc
|
||||
%{_qt5_docdir}/qtdoc*
|
||||
%endif
|
||||
|
||||
%package -n qt5-qtwayland-doc
|
||||
Summary: Documentation for qtwayland
|
||||
@ -302,15 +255,6 @@ 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
|
||||
|
||||
@ -330,53 +274,27 @@ 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}
|
||||
tar xf %{SOURCE0} -C %{buildroot}
|
||||
cd %{buildroot}
|
||||
tar xf %{SOURCE0}
|
||||
|
||||
## unpackaged files
|
||||
pushd %{buildroot}%{_qt5_docdir}
|
||||
rm -rfv \
|
||||
qdoc* \
|
||||
qtdistancefieldgenerator* \
|
||||
qtdoc* qtcmake* \
|
||||
qtlottieanimation* \
|
||||
qtpdf* \
|
||||
qtwebengine*
|
||||
|
||||
popd
|
||||
cd %{buildroot}%{_docdir}/qt5
|
||||
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#2061353
|
||||
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.1-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (qt-doc-opensource-src-5.15.1.tar.xz) = 52c8420457d9c4758739b405ecffc9531a3da280ff73cbe2f9ba5e5b7963f2ca87e6acb03be48f8eb89344fbdcc28a22aa376d3253042a0c7b08b7d6468f1f72
|
||||
SHA512 (qt-doc-opensource-src-5.15.3.tar.xz) = 35565324982af65f670a680f6971e3f59da278f65a53cb1f8de899abd1c229b86520e50b5c3bb46343a09dd84a5013409ab63b38c6d7c8bd18a6e423c10557e8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user