Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qbs for openSUSE:Factory checked in at 2021-04-29 22:46:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qbs (Old) and /work/SRC/openSUSE:Factory/.qbs.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qbs" Thu Apr 29 22:46:25 2021 rev:11 rq:889209 version:1.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qbs/qbs.changes 2021-02-01 13:30:55.486343993 +0100 +++ /work/SRC/openSUSE:Factory/.qbs.new.1947/qbs.changes 2021-04-29 22:53:00.106000982 +0200 @@ -1,0 +2,8 @@ +Thu Apr 29 07:20:53 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Add patch to fix the qmake detection (boo#1185429): + * 0001-Use-qmake-qt5-for-openSUSE.patch +- Stop setting libexec paths for Tumbleweed. The default values + can be used. + +------------------------------------------------------------------- New: ---- 0001-Use-qmake-qt5-for-openSUSE.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qbs.spec ++++++ --- /var/tmp/diff_new_pack.HmyN9Y/_old 2021-04-29 22:53:00.585998844 +0200 +++ /var/tmp/diff_new_pack.HmyN9Y/_new 2021-04-29 22:53:00.589998827 +0200 @@ -17,7 +17,7 @@ # -%define qt5_version 5.11.0 +%define qt5_version 5.14.0 Name: qbs Version: 1.18.0 Release: 0 @@ -33,6 +33,8 @@ Source: https://download.qt.io/official_releases/%{name}/%{version}/%{name}-src-%{version}.tar.gz # PATCH-FIX-OPENSUSE fix-env-script-interpreter.patch -- Avoid the "env-script-interpreter" warning when building Patch0: fix-env-script-interpreter.patch +# PATCH-FIX-OPENSUSE +Patch1: 0001-Use-qmake-qt5-for-openSUSE.patch BuildRequires: fdupes BuildRequires: libQt5Concurrent-devel >= %{qt5_version} BuildRequires: libQt5Core-devel >= %{qt5_version} @@ -67,25 +69,26 @@ This package is required to develop applications using %{name} as a library %prep -%setup -q -n %{name}-src-%{version} -%patch0 -p1 +%autosetup -p1 -n %{name}-src-%{version} %build makeopts="" # QBS_LIBEXEC_DESTDIR, QBS_RELATIVE_LIBEXEC_PATH need to be -# set because the defaults are hardcoded to 'libexec' +# set for Leap 15 because the defaults are hardcoded to 'libexec' # # qbs_enable_project_file_updates allow to build Qt Creator # against the installed qbs. %qmake5 %{name}.pro -r QBS_INSTALL_PREFIX=%{_prefix} \ QBS_LIBRARY_DIRNAME=%{_lib} \ - QBS_LIBEXEC_DESTDIR=../../../lib/%{name} \ QBS_LIBEXEC_INSTALL_DIR=%{_libexecdir}/%{name} \ - QBS_RELATIVE_LIBEXEC_PATH=../lib/%{name} \ QBS_LIB_INSTALL_DIR=%{_libdir} \ QBS_PLUGINS_INSTALL_DIR=%{_libdir} \ - CONFIG+=qbs_enable_project_file_updates + CONFIG+=qbs_enable_project_file_updates \ +%if 0%{?suse_version} <= 1500 + QBS_RELATIVE_LIBEXEC_PATH=../lib/%{name} \ + QBS_LIBEXEC_DESTDIR=../../../lib/%{name} +%endif %make_build $makeopts ++++++ 0001-Use-qmake-qt5-for-openSUSE.patch ++++++ >From 2699d00d9593d746aea0e618b0823830e7feddbd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Thu, 29 Apr 2021 09:18:59 +0200 Subject: [PATCH] Use qmake-qt5 for openSUSE. --- share/qbs/module-providers/Qt/setup-qt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index a67f79d..4d8b4d5 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -60,7 +60,7 @@ function getQmakeFilePaths(qmakeFilePaths, qbs) { var suffix = exeSuffix(qbs); var filePaths = []; for (var i = 0; i < dirs.length; ++i) { - var candidate = FileInfo.joinPaths(dirs[i], "qmake" + suffix); + var candidate = FileInfo.joinPaths(dirs[i], "qmake-qt5" + suffix); var canonicalCandidate = FileInfo.canonicalPath(candidate); if (!canonicalCandidate || !File.exists(canonicalCandidate)) continue; -- 2.31.1
