From e1b1d4754313dd06a4bac222e48c16a56ee6f79f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 26 Mar 2018 11:57:45 +0200 Subject: [PATCH] Prevent having 2 spec files in the source tree, it causes troubles with rpmbuild. --- build/rpm/{qt5.spec => qt5.spec.in} | 0 tools/build_qt_rpm | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename build/rpm/{qt5.spec => qt5.spec.in} (100%) diff --git a/build/rpm/qt5.spec b/build/rpm/qt5.spec.in similarity index 100% rename from build/rpm/qt5.spec rename to build/rpm/qt5.spec.in diff --git a/tools/build_qt_rpm b/tools/build_qt_rpm index c03c77940..dfaf06f57 100755 --- a/tools/build_qt_rpm +++ b/tools/build_qt_rpm @@ -74,4 +74,5 @@ cd .. mkdir -p ${RPM_FOLDER}/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} tar --transform "s/^${REPO_FOLDER}/${RPM_NAME}/" -czvf ${RPM_FOLDER}/rpmbuild/SOURCES/${RPM_NAME}.tar.gz ${REPO_FOLDER}/ -rpmbuild -bb --define "_topdir $PWD/${RPM_FOLDER}/rpmbuild" build/rpm/qt5.spec +rpmbuild -bb --define "_topdir $PWD/${RPM_FOLDER}/rpmbuild" build/rpm/qt5.spec.in +