Bug 1255054
| Summary: | qdoc valgrind wrapper ending up in installed files | ||
|---|---|---|---|
| Product: | [Fedora] Fedora | Reporter: | Sandro Mani <manisandro> |
| Component: | qt5-qtbase | Assignee: | Than Ngo <than> |
| Status: | CLOSED RAWHIDE | QA Contact: | Fedora Extras Quality Assurance <extras-qa> |
| Severity: | unspecified | Docs Contact: | |
| Priority: | unspecified | ||
| Version: | rawhide | CC: | jgrulich, jreznik, kevin, ltinkl, rdieter, rnovacek, than |
| Target Milestone: | --- | Keywords: | Reopened |
| Target Release: | --- | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
| Whiteboard: | |||
| Fixed In Version: | Doc Type: | Bug Fix | |
| Doc Text: | Story Points: | --- | |
| Clone Of: | Environment: | ||
| Last Closed: | 2015-08-24 15:03:05 UTC | Type: | Bug |
| Regression: | --- | Mount Type: | --- |
| Documentation: | --- | CRM: | |
| Verified Versions: | Category: | --- | |
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
| Cloudforms Team: | --- | Target Upstream Version: | |
| Embargoed: | |||
| Bug Depends On: | |||
| Bug Blocks: | 1256192 | ||
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. |
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