diff --git a/.gitignore b/.gitignore index bdd757c..db6958b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /qbs-src-1.14.0.tar.gz /qbs-src-1.14.1.tar.gz /qbs-src-1.15.0.tar.gz +/qbs-src-1.16.0.tar.gz diff --git a/qbs.spec b/qbs.spec index e6c3cef..0d31441 100644 --- a/qbs.spec +++ b/qbs.spec @@ -10,8 +10,8 @@ Name: qbs # qbs was previously packaged as part of qt-creator, using the qt-creator version, hence the epoch bump Epoch: 1 -Version: 1.15.0 -Release: 2%{?commit:.git%{shortcommit}}%{?dist} +Version: 1.16.0 +Release: 1%{?commit:.git%{shortcommit}}%{?dist} Summary: Cross platform build tool # See LGPL_EXCEPTION.txt @@ -123,10 +123,8 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} # TODO: Some tests fail with a timeout error on these arches QBS_AUTOTEST_PROFILE=qt5 make check || : %else -# TODO: These three tests fail in mock only: -# FAIL! : TestBlackbox::artifactScanning() Compared values are not the same -# FAIL! : TestBlackbox::missingDependency() 'm_qbsStderr.contains("false positive")' returned FALSE. () -# FAIL! : TestBlackbox::wholeArchive(link whole archive) Compared values are not the same +# TODO: This test results in a SIGBUS +# TestLanguage::nonRequiredProducts QBS_AUTOTEST_PROFILE=qt5 make check || : %endif @@ -136,12 +134,12 @@ QBS_AUTOTEST_PROFILE=qt5 make check || : %files %license LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt -%doc README +%doc README.md %{_bindir}/%{name}* %{_libdir}/%{name}/ %{_libdir}/libqbs*.so.1 -%{_libdir}/libqbs*.so.1.15 -%{_libdir}/libqbs*.so.1.15.* +%{_libdir}/libqbs*.so.1.16 +%{_libdir}/libqbs*.so.1.16.* %{_libexecdir}/qbs/ %{_datadir}/%{name}/ %{_mandir}/man1/%{name}.1* @@ -161,6 +159,9 @@ QBS_AUTOTEST_PROFILE=qt5 make check || : %doc %{_docdir}/%{name}/html/ %changelog +* Thu May 07 2020 Sandro Mani - 1:1.16.0-1 +- Update to 1.16.0 + * Thu Jan 30 2020 Fedora Release Engineering - 1:1.15.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/qbs_test_pluginMetaData.patch b/qbs_test_pluginMetaData.patch index 3f7a362..642051f 100644 --- a/qbs_test_pluginMetaData.patch +++ b/qbs_test_pluginMetaData.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qbs-src-1.15.0/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp qbs-src-1.15.0-new/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp ---- qbs-src-1.15.0/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp 2019-12-10 13:29:19.000000000 +0100 -+++ qbs-src-1.15.0-new/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp 2019-12-13 18:01:59.715649905 +0100 +diff -rupN --no-dereference qbs-src-1.16.0/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp qbs-src-1.16.0-new/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp +--- qbs-src-1.16.0/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp 2020-04-24 13:03:13.000000000 +0200 ++++ qbs-src-1.16.0-new/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp 2020-04-27 17:20:46.658857760 +0200 @@ -32,6 +32,7 @@ #include #include diff --git a/sources b/sources index bc9c859..ff075ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qbs-src-1.15.0.tar.gz) = 461ac2e1574c163149b080936233144b3941024e7f61c2b2514e58089b7fa100e576c0336e16a3c51a0f4b77e575081350550e23b543e86a2023d524aba18d07 +SHA512 (qbs-src-1.16.0.tar.gz) = 65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c