Fedora Account System
Red Hat Associate
Red Hat Customer
Description of problem: These lines in qt5-qtbase.spec make html_docs || \ mv bin/qdoc bin/qdoc.orig && install %{SOURCE2} bin/qdoc && \ make html_docs && \ mv bin/qdoc.orig bin/qdoc -f fail to correctly restore qdoc with qdoc.orig if also the second make html_docs fails. This is causing qt-creator to fail to build: https://koji.fedoraproject.org/koji/getfile?taskID=10754160&name=build.log&offset=-4000 Version-Release number of selected component (if applicable): qt5-qtbase-5.5.0-16.fc24.x86_64
Interesting, I'd expect the build to fail of 'make html_docs' fails though
%changelog * Wed Aug 19 2015 Rex Dieter <rdieter> 5.5.0-17 - unconditionally undo valgrind hack when done (#1255054)
Thanks.
The build failed, something like this should work though: diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 8d8335e..bba391a 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -484,10 +484,10 @@ pushd src/xml; ../../bin/qmake; popd # see also https://bugreports.qt-project.org/browse/QTBUG-42071 QT_HASH_SEED=0; export QT_HASH_SEED %if 0%{?valgrind} -make html_docs || \ +make html_docs || (\ mv bin/qdoc bin/qdoc.orig && install %{SOURCE2} bin/qdoc && \ - make html_docs - mv bin/qdoc.orig bin/qdoc -f + make html_docs) + [ -e bin/qdoc.orig ] && mv -f bin/qdoc.orig bin/qdoc %else make html_docs %endif http://koji.fedoraproject.org/koji/taskinfo?taskID=10769302
Build succeeded, thanks.