diff --git a/.gitignore b/.gitignore index b31433a..e1c7ef6 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /qbs-src-2.0.1.tar.gz /qbs-src-2.0.2.tar.gz /qbs-src-2.1.0.tar.gz +/qbs-src-2.1.1.tar.gz diff --git a/qbs.spec b/qbs.spec index 4ecdb02..b9a612f 100644 --- a/qbs.spec +++ b/qbs.spec @@ -10,7 +10,7 @@ Name: qbs # qbs was previously packaged as part of qt-creator, using the qt-creator version, hence the epoch bump Epoch: 1 -Version: 2.1.0 +Version: 2.1.1 Release: 1%{?dist} Summary: Cross platform build tool # Fails to build on i686 @@ -148,6 +148,9 @@ rm %{buildroot}%{_bindir}/tst_* %changelog +* Fri Aug 04 2023 Sandro Mani - 1:2.1.1-1 +- Update to 2.1.1 + * Wed Jul 26 2023 Sandro Mani - 1:2.1.0-1 - Update to 2.1.0 diff --git a/qbs_qmake.patch b/qbs_qmake.patch index bdfb60a..af35af8 100644 --- a/qbs_qmake.patch +++ b/qbs_qmake.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qbs-src-2.1.0/share/qbs/module-providers/Qt/setup-qt.js qbs-src-2.1.0-new/share/qbs/module-providers/Qt/setup-qt.js ---- qbs-src-2.1.0/share/qbs/module-providers/Qt/setup-qt.js 2023-07-20 22:07:27.000000000 +0200 -+++ qbs-src-2.1.0-new/share/qbs/module-providers/Qt/setup-qt.js 2023-07-26 22:48:22.275997939 +0200 +diff -rupN --no-dereference qbs-src-2.1.1/share/qbs/module-providers/Qt/setup-qt.js qbs-src-2.1.1-new/share/qbs/module-providers/Qt/setup-qt.js +--- qbs-src-2.1.1/share/qbs/module-providers/Qt/setup-qt.js 2023-08-03 14:58:40.000000000 +0200 ++++ qbs-src-2.1.1-new/share/qbs/module-providers/Qt/setup-qt.js 2023-08-04 09:53:55.750810986 +0200 @@ -57,16 +57,19 @@ function getQmakeFilePaths(qmakeFilePath var pathValue = Environment.getEnv("PATH"); if (pathValue) { diff --git a/qbs_tst_blackbox_stderr.patch b/qbs_tst_blackbox_stderr.patch index 0ad3305..ce3273e 100644 --- a/qbs_tst_blackbox_stderr.patch +++ b/qbs_tst_blackbox_stderr.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qbs-src-2.1.0/tests/auto/blackbox/tst_blackbox.cpp qbs-src-2.1.0-new/tests/auto/blackbox/tst_blackbox.cpp ---- qbs-src-2.1.0/tests/auto/blackbox/tst_blackbox.cpp 2023-07-20 22:07:27.000000000 +0200 -+++ qbs-src-2.1.0-new/tests/auto/blackbox/tst_blackbox.cpp 2023-07-26 22:48:22.048998670 +0200 +diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp qbs-src-2.1.1-new/tests/auto/blackbox/tst_blackbox.cpp +--- qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp 2023-08-03 14:58:40.000000000 +0200 ++++ qbs-src-2.1.1-new/tests/auto/blackbox/tst_blackbox.cpp 2023-08-04 09:53:55.486810899 +0200 @@ -62,6 +62,20 @@ #define WAIT_FOR_NEW_TIMESTAMP() waitForNewTimestamp(testDataDir) diff --git a/sources b/sources index c71810a..ab51066 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qbs-src-2.1.0.tar.gz) = 3b4df08b3795568be115ae7a8ab5a085b64b7a64e95ceef1cc3acb04593fcaaf41b70fe80e2061be81ab8ac93e736e78442108568852794fe24610bf8dc8e505 +SHA512 (qbs-src-2.1.1.tar.gz) = 32b5a33920484d2e72cd45e3309f980539813815ff39b4f5ca2269556bdb46d02e204732cf23e9e2b1a9afad258ab8e5bcfc612bd94f64d5dbeb1fcf3cc74e90