From 1e7c1152f89d2602fc70118ca736c57efd0d9077 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Mon, 4 Dec 2017 08:23:52 -0600
Subject: [PATCH] omit -qtdoc-doc bits, conflicts with real qt5-qtdoc
 (#1520355) use %_qt5_docdir macro (instead of hard-coded %_docdir/qt5)
 optimize build a bit

---
 qt5-doc.spec | 140 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 82 insertions(+), 58 deletions(-)

diff --git a/qt5-doc.spec b/qt5-doc.spec
index e0d8ee6..dde3b85 100644
--- a/qt5-doc.spec
+++ b/qt5-doc.spec
@@ -1,14 +1,21 @@
 Name:    qt5-doc
 Summary: Qt5 - Complete documentation
 Version: 5.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildArch: noarch
-BuildRequires: qt5-rpm-macros >= 5.5.0
+
 License: 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
 Source1: generate-qt-doc.sh
+
+# optimize build, skip unecessary steps
+%global debug_package   %{nil}
+%global __spec_install_post %{nil}
+
+BuildRequires: qt5-rpm-macros >= 5.5.0
+
 Requires: qt5-qtcanvas3d-doc >= %{version}
 Requires: qt5-qtbase-doc >= %{version}
 Requires: qt5-qt3d-doc >= %{version}
@@ -54,7 +61,7 @@ Summary: Documentation for qtcanvas3d
 %{summary}.
 
 %files -n qt5-qtcanvas3d-doc
-%{_docdir}/qt5/qtcanvas3d*
+%{_qt5_docdir}/qtcanvas3d*
 
 %package -n qt5-qtbase-doc
 Summary: Documentation for qtbase
@@ -63,19 +70,19 @@ Summary: Documentation for qtbase
 %{summary}.
 
 %files -n qt5-qtbase-doc
-%{_docdir}/qt5/qmake*
-%{_docdir}/qt5/qtconcurrent*
-%{_docdir}/qt5/qtcore*
-%{_docdir}/qt5/qtdbus*
-%{_docdir}/qt5/qtgui*
-%{_docdir}/qt5/qtnetwork*
-%{_docdir}/qt5/qtopengl*
-%{_docdir}/qt5/qtplatformheaders*
-%{_docdir}/qt5/qtprintsupport*
-%{_docdir}/qt5/qtsql*
-%{_docdir}/qt5/qtwidgets*
-%{_docdir}/qt5/qtxml*
-%{_docdir}/qt5/qttestlib*
+%{_qt5_docdir}/qmake*
+%{_qt5_docdir}/qtconcurrent*
+%{_qt5_docdir}/qtcore*
+%{_qt5_docdir}/qtdbus*
+%{_qt5_docdir}/qtgui*
+%{_qt5_docdir}/qtnetwork*
+%{_qt5_docdir}/qtopengl*
+%{_qt5_docdir}/qtplatformheaders*
+%{_qt5_docdir}/qtprintsupport*
+%{_qt5_docdir}/qtsql*
+%{_qt5_docdir}/qtwidgets*
+%{_qt5_docdir}/qtxml*
+%{_qt5_docdir}/qttestlib*
 
 %package -n qt5-qt3d-doc
 Summary: Documentation for qt3d
@@ -84,7 +91,7 @@ Summary: Documentation for qt3d
 %{summary}.
 
 %files -n qt5-qt3d-doc
-%{_docdir}/qt5/qt3d*
+%{_qt5_docdir}/qt3d*
 
 %package -n qt5-qtcharts-doc
 Summary: Documentation for qtcharts
@@ -93,8 +100,8 @@ Summary: Documentation for qtcharts
 %{summary}.
 
 %files -n qt5-qtcharts-doc
-%{_docdir}/qt5/qtcharts*
-%{_docdir}/qt5/qtlabs*
+%{_qt5_docdir}/qtcharts*
+%{_qt5_docdir}/qtlabs*
 
 %package -n qt5-qtconnectivity-doc
 Summary: Documentation for qtconnectivity
@@ -103,8 +110,8 @@ Summary: Documentation for qtconnectivity
 %{summary}.
 
 %files -n qt5-qtconnectivity-doc
-%{_docdir}/qt5/qtbluetooth*
-%{_docdir}/qt5/qtnfc*
+%{_qt5_docdir}/qtbluetooth*
+%{_qt5_docdir}/qtnfc*
 
 %package -n qt5-qtdeclarative-doc
 Summary: Documentation for qtdeclarative
@@ -113,8 +120,8 @@ Summary: Documentation for qtdeclarative
 %{summary}.
 
 %files -n qt5-qtdeclarative-doc
-%{_docdir}/qt5/qtqml*
-%{_docdir}/qt5/qtquick*
+%{_qt5_docdir}/qtqml*
+%{_qt5_docdir}/qtquick*
 
 %package -n qt5-qtgraphicaleffects-doc
 Summary: Documentation for qtgraphicaleffects
@@ -123,7 +130,7 @@ Summary: Documentation for qtgraphicaleffects
 %{summary}.
 
 %files -n qt5-qtgraphicaleffects-doc
-%{_docdir}/qt5/qtgraphicaleffects*
+%{_qt5_docdir}/qtgraphicaleffects*
 
 %package -n qt5-qtimageformats-doc
 Summary: Documentation for qtimageformats
@@ -132,7 +139,7 @@ Summary: Documentation for qtimageformats
 %{summary}.
 
 %files -n qt5-qtimageformats-doc
-%{_docdir}/qt5/qtimageformats*
+%{_qt5_docdir}/qtimageformats*
 
 %package -n qt5-qtmultimedia-doc
 Summary: Documentation for qtmultimedia
@@ -141,7 +148,7 @@ Summary: Documentation for qtmultimedia
 %{summary}.
 
 %files -n qt5-qtmultimedia-doc
-%{_docdir}/qt5/qtmultimedia*
+%{_qt5_docdir}/qtmultimedia*
 
 %package -n qt5-qtquickcontrols2-doc
 Summary: Documentation for qtquickcontrols2
@@ -150,7 +157,7 @@ Summary: Documentation for qtquickcontrols2
 %{summary}.
 
 %files -n qt5-qtquickcontrols2-doc
-%{_docdir}/qt5/qtquickcontrols2*
+%{_qt5_docdir}/qtquickcontrols2*
 
 %package -n qt5-qtquickcontrols-doc
 Summary: Documentation for qtquickcontrols
@@ -159,7 +166,7 @@ Summary: Documentation for qtquickcontrols
 %{summary}.
 
 %files -n qt5-qtquickcontrols-doc
-%{_docdir}/qt5/qtquickcontrols*
+%{_qt5_docdir}/qtquickcontrols*
 
 %package -n qt5-qtscript-doc
 Summary: Documentation for qtscript
@@ -168,7 +175,7 @@ Summary: Documentation for qtscript
 %{summary}.
 
 %files -n qt5-qtscript-doc
-%{_docdir}/qt5/qtscript*
+%{_qt5_docdir}/qtscript*
 
 %package -n qt5-qtscxml-doc
 Summary: Documentation for qtscxml
@@ -177,7 +184,7 @@ Summary: Documentation for qtscxml
 %{summary}.
 
 %files -n qt5-qtscxml-doc
-%{_docdir}/qt5/qtscxml*
+%{_qt5_docdir}/qtscxml*
 
 %package -n qt5-qtsensors-doc
 Summary: Documentation for qtsensors
@@ -186,7 +193,7 @@ Summary: Documentation for qtsensors
 %{summary}.
 
 %files -n qt5-qtsensors-doc
-%{_docdir}/qt5/qtsensors*
+%{_qt5_docdir}/qtsensors*
 
 %package -n qt5-qtserialbus-doc
 Summary: Documentation for qtserialbus
@@ -195,7 +202,7 @@ Summary: Documentation for qtserialbus
 %{summary}.
 
 %files -n qt5-qtserialbus-doc
-%{_docdir}/qt5/qtserialbus*
+%{_qt5_docdir}/qtserialbus*
 
 %package -n qt5-qtserialport-doc
 Summary: Documentation for qtserialport
@@ -204,7 +211,7 @@ Summary: Documentation for qtserialport
 %{summary}.
 
 %files -n qt5-qtserialport-doc
-%{_docdir}/qt5/qtserialport*
+%{_qt5_docdir}/qtserialport*
 
 %package -n qt5-qtsvg-doc
 Summary: Documentation for qtsvg
@@ -213,7 +220,7 @@ Summary: Documentation for qtsvg
 %{summary}.
 
 %files -n qt5-qtsvg-doc
-%{_docdir}/qt5/qtsvg*
+%{_qt5_docdir}/qtsvg*
 
 %package -n qt5-qttools-doc
 Summary: Documentation for qttools
@@ -222,12 +229,12 @@ Summary: Documentation for qttools
 %{summary}.
 
 %files -n qt5-qttools-doc
-%{_docdir}/qt5/qdoc*
-%{_docdir}/qt5/qtassistant*
-%{_docdir}/qt5/qtdesigner*
-%{_docdir}/qt5/qthelp*
-%{_docdir}/qt5/qtlinguist*
-%{_docdir}/qt5/qtuitools*
+%{_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
@@ -236,7 +243,7 @@ Summary: Documentation for qtvirtualkeyboard
 %{summary}.
 
 %files -n qt5-qtvirtualkeyboard-doc
-%{_docdir}/qt5/qtvirtualkeyboard*
+%{_qt5_docdir}/qtvirtualkeyboard*
 
 %package -n qt5-qtwebchannel-doc
 Summary: Documentation for qtwebchannel
@@ -245,7 +252,7 @@ Summary: Documentation for qtwebchannel
 %{summary}.
 
 %files -n qt5-qtwebchannel-doc
-%{_docdir}/qt5/qtwebchannel*
+%{_qt5_docdir}/qtwebchannel*
 
 %package -n qt5-qtwebengine-doc
 Summary: Documentation for qtwebengine
@@ -254,7 +261,7 @@ Summary: Documentation for qtwebengine
 %{summary}.
 
 %files -n qt5-qtwebengine-doc
-%{_docdir}/qt5/qtwebengine*
+%{_qt5_docdir}/qtwebengine*
 
 %package -n qt5-qtwebsockets-doc
 Summary: Documentation for qtwebsockets
@@ -263,7 +270,7 @@ Summary: Documentation for qtwebsockets
 %{summary}.
 
 %files -n qt5-qtwebsockets-doc
-%{_docdir}/qt5/qtwebsockets*
+%{_qt5_docdir}/qtwebsockets*
 
 %package -n qt5-qtx11extras-doc
 Summary: Documentation for qtx11extras
@@ -272,8 +279,11 @@ Summary: Documentation for qtx11extras
 %{summary}.
 
 %files -n qt5-qtx11extras-doc
-%{_docdir}/qt5/qtx11extras*
+%{_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
 
@@ -281,7 +291,8 @@ Summary: Documentation for qtdoc
 %{summary}.
 
 %files -n qt5-qtdoc-doc
-%{_docdir}/qt5/qtdoc*
+%{_qt5_docdir}/qtdoc*
+%endif
 
 %package -n qt5-qtspeech-doc
 Summary: Documentation for qtspeech
@@ -290,7 +301,7 @@ Summary: Documentation for qtspeech
 %{summary}.
 
 %files -n qt5-qtspeech-doc
-%{_docdir}/qt5/qtspeech*
+%{_qt5_docdir}/qtspeech*
 
 %package -n qt5-qtremoteobjects-doc
 Summary: Documentation for qtremoteobjects
@@ -299,7 +310,7 @@ Summary: Documentation for qtremoteobjects
 %{summary}.
 
 %files -n qt5-qtremoteobjects-doc
-%{_docdir}/qt5/qtremoteobjects*
+%{_qt5_docdir}/qtremoteobjects*
 
 %package -n qt5-qtpurchasing-doc
 Summary: Documentation for qtpurchasing
@@ -308,7 +319,7 @@ Summary: Documentation for qtpurchasing
 %{summary}.
 
 %files -n qt5-qtpurchasing-doc
-%{_docdir}/qt5/qtpurchasing*
+%{_qt5_docdir}/qtpurchasing*
 
 %package -n qt5-qtwayland-doc
 Summary: Documentation for qtwayland
@@ -317,7 +328,7 @@ Summary: Documentation for qtwayland
 %{summary}.
 
 %files -n qt5-qtwayland-doc
-%{_docdir}/qt5/qtwayland*
+%{_qt5_docdir}/qtwayland*
 
 %package -n qt5-qtwebview-doc
 Summary: Documentation for qtwebview
@@ -326,7 +337,7 @@ Summary: Documentation for qtwebview
 %{summary}.
 
 %files -n qt5-qtwebview-doc
-%{_docdir}/qt5/qtwebview*
+%{_qt5_docdir}/qtwebview*
 
 %package -n qt5-qtlocation-doc
 Summary: Documentation for qtlocation
@@ -335,8 +346,8 @@ Summary: Documentation for qtlocation
 %{summary}.
 
 %files -n qt5-qtlocation-doc
-%{_docdir}/qt5/qtlocation*
-%{_docdir}/qt5/qtpositioning*
+%{_qt5_docdir}/qtlocation*
+%{_qt5_docdir}/qtpositioning*
 
 %package -n qt5-qtxmlpatterns-doc
 Summary: Documentation for qtxmlpatterns
@@ -345,7 +356,7 @@ Summary: Documentation for qtxmlpatterns
 %{summary}.
 
 %files -n qt5-qtxmlpatterns-doc
-%{_docdir}/qt5/qtxmlpatterns*
+%{_qt5_docdir}/qtxmlpatterns*
 
 %package -n qt5-qtdatavis3d-doc
 Summary: Documentation for qtdatavis3d
@@ -354,8 +365,8 @@ Summary: Documentation for qtdatavis3d
 %{summary}.
 
 %files -n qt5-qtdatavis3d-doc
-%{_docdir}/qt5/qtdatavis3d*
-%{_docdir}/qt5/qtdatavisualization*
+%{_qt5_docdir}/qtdatavis3d*
+%{_qt5_docdir}/qtdatavisualization*
 
 %package -n qt5-qtgamepad-doc
 Summary: Documentation for qtgamepad
@@ -364,9 +375,16 @@ Summary: Documentation for qtgamepad
 %{summary}.
 
 %files -n qt5-qtgamepad-doc
-%{_docdir}/qt5/qtgamepad*
+%{_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}
@@ -374,10 +392,16 @@ tar xf %{SOURCE0}
 
 # Remove non used
 cd %{buildroot}%{_docdir}/qt5
-rm -rf activeqt* qtandroidextras* qtmacextras* qtwinextras*
+rm -rfv activeqt* qtandroidextras* qtmacextras* qtwinextras*
+rm -rfv qtdoc*
 
 
 %changelog
+* Mon Dec 04 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2
+- omit -qtdoc-doc bits, conflicts with real qt5-qtdoc (#1520355)
+- use %%_qt5_docdir macro (instead of hard-coded %%_docdir/qt5)
+- optimize build a bit
+
 * Tue Oct 10 2017 Martin Bříza <mbriza@redhat.com> - 5.9.2-1
 - Update to 5.9.2