Obsoletes: qt5-qtcanvas3d-doc
This commit is contained in:
Rex Dieter 2020-04-11 20:02:09 -05:00
parent 81f74d148a
commit 521d1ea848
4 changed files with 32 additions and 49 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/qt-doc-opensource-src-5.11.1.tar.xz
/qt-doc-opensource-src-5.12.3.tar.xz
/qt-doc-opensource-src-5.13.tar.xz

View File

@ -1,14 +1,14 @@
#!/bin/bash -x
QT_BRANCH=5.12
QT_VERSION=5.12.3
QT_BRANCH=5.13
QT_VERSION=5.13
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
@ -35,16 +35,19 @@ git submodule foreach "git pull"
$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 .

View File

@ -1,7 +1,7 @@
Name: qt5-doc
Summary: Qt5 - Complete documentation
Version: 5.12.3
Release: 3%{?dist}
Version: 5.13
Release: 1%{?dist}
BuildArch: noarch
License: GFDL
@ -16,7 +16,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 +38,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,15 +54,6 @@ 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*
%package -n qt5-qtbase-doc
Summary: Documentation for qtbase
@ -254,15 +245,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 +263,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 +351,32 @@ 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* \
qtwebengine*
popd
%changelog
* Sat Apr 11 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.13-1
- 5.13
- Obsoletes: qt5-qtcanvas3d-doc
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (qt-doc-opensource-src-5.12.3.tar.xz) = 2bdf20ce2264accd8a9fe0da5332b81bd6656f5801af1601bfa3dc37a7fbe9c3e52c224014f028079d563d8e5a13daddc87357d56ca27c783fc171cfb663899b
SHA512 (qt-doc-opensource-src-5.13.tar.xz) = 7069b3fdfd346f16cdf829dfac74ba6c123db938dbd3ed4f77b806ec499388d51a495bda67481588585c2a9e432b26dc5e647f50acaa553e291ca33199bb7ca0