try to fix intermittent parallel install failure

avoid race between ping.pro and pong.pro trying to install same
ping-common.h file by dropping it from HEADERS in the latter project
file.

see https://bugreports.qt.io/browse/QTBUG-106494

diff --git a/parallel-install.patch b/parallel-install.patch
new file mode 100644 (file)
index 0000000..bea177c
--- /dev/null
+++ b/parallel-install.patch
@@ -0,0 +1,11 @@
+--- qtbase-everywhere-src-5.15.6/examples/dbus/pingpong/pong.pro.orig  2022-06-24 12:42:02.000000000 +0200
++++ qtbase-everywhere-src-5.15.6/examples/dbus/pingpong/pong.pro       2022-09-09 15:59:37.502927447 +0200
+@@ -1,7 +1,7 @@
+ QT -= gui
+ QT += dbus
+ 
+-HEADERS += ping-common.h pong.h
++HEADERS += pong.h
+ SOURCES += pong.cpp
+ 
+ target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 8a86c0fa95f93fa9aba97b437c7634e19572758c..9653b5b74a442de5a2a575c4ed4a3aed771e8925 100644 (file)
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -79,6 +79,7 @@ Source0:      https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/
 Source1:       https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-opensource-src-%{version}.tar.xz
 # Source1-md5: d520657e72631d4b82cba1e0292b2405
 Patch0:                %{name}-system_cacerts.patch
+Patch1:                parallel-install.patch
 Patch2:                egl-x11.patch
 URL:           https://www.qt.io/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
@@ -1173,6 +1174,7 @@ Generator plików makefile dla aplikacji Qt5.
 %prep
 %setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf