From 8161a97109af548426b57d3227bf2cf0f0668457f94debe513dcbcb041a056e6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 11 Feb 2019 11:48:08 +0000 Subject: [PATCH 1/4] Accepting request 672825 from home:seanlew:branches:devel:tools:building Update cmake OBS-URL: https://build.opensuse.org/request/show/672825 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=347 --- cmake-3.13.3-SHA-256.txt | 11 ----------- cmake-3.13.3-SHA-256.txt.asc | 16 ---------------- cmake-3.13.3.tar.gz | 3 --- cmake-3.13.4-SHA-256.txt | 11 +++++++++++ cmake-3.13.4-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.13.4.tar.gz | 3 +++ cmake-gui.changes | 6 ++++++ cmake-gui.spec | 2 +- cmake.changes | 8 ++++++++ cmake.spec | 2 +- 10 files changed, 46 insertions(+), 32 deletions(-) delete mode 100644 cmake-3.13.3-SHA-256.txt delete mode 100644 cmake-3.13.3-SHA-256.txt.asc delete mode 100644 cmake-3.13.3.tar.gz create mode 100644 cmake-3.13.4-SHA-256.txt create mode 100644 cmake-3.13.4-SHA-256.txt.asc create mode 100644 cmake-3.13.4.tar.gz diff --git a/cmake-3.13.3-SHA-256.txt b/cmake-3.13.3-SHA-256.txt deleted file mode 100644 index b60b530..0000000 --- a/cmake-3.13.3-SHA-256.txt +++ /dev/null @@ -1,11 +0,0 @@ -261609884989bf2933edfd1e016c9cb87c7e456ba686510b348bee542d051847 cmake-3.13.3-Darwin-x86_64.dmg -cee923ec7a88350f78dac06f0dfae5dec3c9cef331686acfd36ef7dd5aea84db cmake-3.13.3-Darwin-x86_64.tar.gz -b960f100694d7a35a47799d09ede160af5bdeb1c66d098ce85c5009bfe76afde cmake-3.13.3-Linux-x86_64.sh -78227de38d574d4d19093399fd4b40a4fb0a76cbfc4249783a969652ce515270 cmake-3.13.3-Linux-x86_64.tar.gz -6952354433d8fd31fd47a8a1b5e638c42bf20f8d05dd2153e4110870d89a2e60 cmake-3.13.3-win32-x86.msi -1382a32494b49d0554268a6d4c321865ace7e66c9189323c4f43630f067cf135 cmake-3.13.3-win32-x86.zip -4d3a17e66711128f3c928d68d2a0a9c17c7a3012e077af91d372e7570ac68d08 cmake-3.13.3-win64-x64.msi -6edc6686cd29572984497bb14de338b496604b5029c75321bf559d47664b38ab cmake-3.13.3-win64-x64.zip -a8f1ca0bfb5c2b37be9b5cf9ac659ee886b7e48e4e6ea2162e58c156c89675e8 cmake-3.13.3.tar.Z -665f905036b1f731a2a16f83fb298b1fb9d0f98c382625d023097151ad016b25 cmake-3.13.3.tar.gz -4de19b7f74e7de444df710423bb04dcf3da01bc31ba9b867fc04c77d88ce44b6 cmake-3.13.3.zip diff --git a/cmake-3.13.3-SHA-256.txt.asc b/cmake-3.13.3-SHA-256.txt.asc deleted file mode 100644 index 23c5898..0000000 --- a/cmake-3.13.3-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlw8lYgACgkQLSzvEDSS -FoSBXg//eXqno1R3MF1ACSvP1NkplOrGvYmqhyDrKeecSw/ifkYUPEN2xtO2SEyV -PT8ZHmMTnYsCG6nAbrpfC/j3ITvQCyKftPdoM1ePq4LVD7YUnHgAwGe4+VrXfuvF -IBBCdCuYomPTCp+/CHh9kjvqH8YJ88EQA6TLlJN1cLNGJAc6KmxkY/+XXskS5fLi -7jMStU+tKJq+lJCyasDwwVXEb46iiiZrit6Hik6X2Qnqyddjs4HZ+Ep972TgjHrD -e5N+mvhLOGa51AxJYMSUBSgkx4bma7cXeFURllkow2/eQQSV8IoyzQEpMtmGYKR3 -5lcrPJ4e02z3aotG/n3Okh9qExboWRdqSivaV46i6FOyjuIJQCcuaveQuJwpD0fO -t1m1jjNAMFlYUB/fHYcOl+GjvCUAFMgEGvM9bp1aZcT95J+5yQIfBO5NN2+B4VX/ -8o54f7jClm8JSG1KwIi19mn28AhrHjQjxG8VO2UBFQPhKRcBOjXUX2PVVX3tSJSi -8HxuU69n0zo/kbmBGWZxyQcROUOhIzIothEL3wGkLu5uAYQGKZxSt+A+keKLJYpa -QrPGb01FTJvMumHaAUldsX0OMue4YuJmwMKBR8+MiMQib4cOPXnAYB9QRGfw1fd/ -YtgMGS4E26dxMcrwPsjwbtoXvQg5IU9M9dPsBKV++dEnfwiMsmc= -=Ndgt ------END PGP SIGNATURE----- diff --git a/cmake-3.13.3.tar.gz b/cmake-3.13.3.tar.gz deleted file mode 100644 index 225e2fb..0000000 --- a/cmake-3.13.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:665f905036b1f731a2a16f83fb298b1fb9d0f98c382625d023097151ad016b25 -size 8616403 diff --git a/cmake-3.13.4-SHA-256.txt b/cmake-3.13.4-SHA-256.txt new file mode 100644 index 0000000..d4d9c27 --- /dev/null +++ b/cmake-3.13.4-SHA-256.txt @@ -0,0 +1,11 @@ +411c480b0f179054c26c4f854b2761b1fbbbe18c7c142f6554b0b363b4c21eaa cmake-3.13.4-Darwin-x86_64.dmg +fef537614d73fda848f6168273b6c7ba45f850484533361e7bc50ac1d315f780 cmake-3.13.4-Darwin-x86_64.tar.gz +a3265957ef8784a89e2f71164273cce7cbbf3f1d4a98227bc31557ab889681c2 cmake-3.13.4-Linux-x86_64.sh +563a39e0a7c7368f81bfa1c3aff8b590a0617cdfe51177ddc808f66cc0866c76 cmake-3.13.4-Linux-x86_64.tar.gz +7c37235ece6ce85aab2ce169106e0e729504ad64707d56e4dbfc982cb4263847 cmake-3.13.4-win32-x86.msi +28daf772f55d817a13ef14e25af2a5569f8326dac66a6aa3cc5208cf1f8e943f cmake-3.13.4-win32-x86.zip +64ac7dd5411b48c2717e15738b83ea0d4347cd51b940487dff7f99a870656c09 cmake-3.13.4-win64-x64.msi +bcd477d49e4a9400b41213d53450b474beaedb264631693c958ef9affa8e5623 cmake-3.13.4-win64-x64.zip +a4d081bdc49fa25b0913d602a9be8be462bb2fc246926b553d97e52fb0a1b56e cmake-3.13.4.tar.Z +fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b cmake-3.13.4.tar.gz +fcde2bd40241b90d9806fb1db52972a80f727f3a156c29f9514b16f4004799d7 cmake-3.13.4.zip diff --git a/cmake-3.13.4-SHA-256.txt.asc b/cmake-3.13.4-SHA-256.txt.asc new file mode 100644 index 0000000..132582c --- /dev/null +++ b/cmake-3.13.4-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlxUXWcACgkQLSzvEDSS +FoSIOg//XfPqFpCwykfeDkWasQrlG1pzV4qNwvQgb72dAHX0HoVnpa7BaYInq7bc +6hCaftetAPyCiAJSXgsUa6y4x3inVLfre1eiQzffUF4AA9U7CBa1GTSZDGg7UQ86 +tkan1ADVNON8ppBvl0kPemx/PzVqroqjsUyUdRV3DPJk9q7ECWBIOhe5qr28aCMu +ofC8taKJ+znG/98yKrWqX4FzDtaxQHH5NxcWe4M7pIXV3CxQn5XMTuxcFBMnNWWm +t15DqbjwTZlpXHLUJSvAkYkryo6WW2i12LLWhg8YbYrToZM8scticx10uZn7GxK9 +NLcyamvlXFMQs0TF6XcxeB1Aq175NPV6e179wrYFIBqdFQm9jr4vsCa5Qg4s9N6k +U5cSrgUb4/3Ta3fq1pHmWrbyDJ0FWfbQuMRTEcKwbw8nWPN1HD4z3SL4gV7ifgYK +SDBX7JME6uJr4iss1FKghToPj2GQZ0ggLDXuXUjBxxBAG15GVCDmZo0dm9+1Phu/ +drPCezNPVxap7C9PZzu3y0rYOjs5azzux93VgkwWI8u8hBPp/Yq9eRNDVAW+b+kC +DY7z484ZiiwlRqCabfPqu226PYVKGL8IcqGsKF3x03wOnUy1JU58z7/PkfBI3gSg +EDk4NMkuvSJ7dHzmZRgW0/AKjZMiVPHtkcp4wMf83W/DMaBYnxU= +=yOm3 +-----END PGP SIGNATURE----- diff --git a/cmake-3.13.4.tar.gz b/cmake-3.13.4.tar.gz new file mode 100644 index 0000000..fc6850f --- /dev/null +++ b/cmake-3.13.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b +size 8617881 diff --git a/cmake-gui.changes b/cmake-gui.changes index e52a773..177a407 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 08 14:03:11 UTC 2019 - seanlew@opensuse.org + +- update to 3.13.4 + * No changes specific to CMake-GUI + ------------------------------------------------------------------- Tue Jan 15 01:57:44 UTC 2019 - seanlew@opensuse.org diff --git a/cmake-gui.spec b/cmake-gui.spec index ecc21f8..7327ff9 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -18,7 +18,7 @@ %define shortversion 3.13 Name: cmake-gui -Version: 3.13.3 +Version: 3.13.4 Release: 0 Summary: CMake graphical user interface License: BSD-3-Clause diff --git a/cmake.changes b/cmake.changes index f0fe9ca..fc0f779 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 08 14:03:11 UTC 2019 - seanlew@opensuse.org + +- update to 3.13.4 + * Tests: add cases for providing Qt5Core_VERSION manually + * Autogen: query Qt5 version from dir properties + * Revert "file: Allow DOWNLOAD/UPLOAD using alternate auth" + ------------------------------------------------------------------- Tue Jan 29 09:57:18 UTC 2019 - Tomáš Chvátal diff --git a/cmake.spec b/cmake.spec index 625b1a5..257394e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -18,7 +18,7 @@ %define shortversion 3.13 Name: cmake -Version: 3.13.3 +Version: 3.13.4 Release: 0 Summary: Cross-platform, open-source make system License: BSD-3-Clause From 5aa0355da1fd5a6046285c24fccfad6744d57d7c74e370b80dc35812e93cd617 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 12 Feb 2019 14:17:26 +0000 Subject: [PATCH 2/4] Accepting request 673889 from home:dancermak:branches:devel:tools:building Install cmake-mode.el with cmake OBS-URL: https://build.opensuse.org/request/show/673889 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=348 --- cmake.changes | 5 +++++ cmake.spec | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cmake.changes b/cmake.changes index fc0f779..59147c7 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 12 13:05:51 UTC 2019 - Dan Čermák + +- Install cmake-mode.el + ------------------------------------------------------------------- Fri Feb 08 14:03:11 UTC 2019 - seanlew@opensuse.org diff --git a/cmake.spec b/cmake.spec index 257394e..7168c5c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -40,6 +40,7 @@ Patch5: system-libs.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch7: feature-suse-python-interp-search-order.patch Patch8: c17-default.patch +BuildRequires: emacs-nox BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 @@ -117,6 +118,13 @@ do ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions done +# cmake-mode.el +%define cmake_mode_el %{_datadir}/emacs/site-lisp/%{name}-mode.el +install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{cmake_mode_el} +/usr/bin/emacs-nox -batch --no-init-file --no-site-file \ + --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile \ + %{buildroot}%{cmake_mode_el} + %fdupes %{buildroot}%{_datadir}/cmake %check @@ -129,7 +137,7 @@ done -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne)|CPack_RPM)" %files -%license Copyright.txt +%license Copyright.txt %doc README.rst %config %{_rpmconfigdir}/macros.d/macros.cmake %{_libexecdir}/rpm @@ -143,5 +151,6 @@ done %{_datadir}/aclocal/cmake.m4 %doc %{_docdir}/%{name} %{_datadir}/bash-completion +%{cmake_mode_el}* %changelog From 8fd193cfd65acdfad0218d5ee4498dc840addee40c014543027c2b629475069e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 15 Feb 2019 09:23:04 +0000 Subject: [PATCH 3/4] - Drop emacs support as it leads to creation of build cycle OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=349 --- cmake-gui.spec | 14 +++++++------- cmake.changes | 5 +++++ cmake.spec | 33 ++++++++++++--------------------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/cmake-gui.spec b/cmake-gui.spec index 7327ff9..06bab48 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -17,6 +17,13 @@ %define shortversion 3.13 +# exclude for SLE 12 and Leap 42.x +%if 0%{?suse_version} == 1315 +%define system_libuv OFF +%else +%define system_libuv ON +BuildRequires: libuv-devel >= 1.10 +%endif Name: cmake-gui Version: 3.13.4 Release: 0 @@ -37,13 +44,6 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libexpat-devel -# exclude for SLE 12 and Leap 42.x -%if 0%{?suse_version} == 1315 -%define system_libuv OFF -%else -BuildRequires: libuv-devel >= 1.10 -%define system_libuv ON -%endif BuildRequires: openssl-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 diff --git a/cmake.changes b/cmake.changes index 59147c7..7f96375 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 15 09:22:35 UTC 2019 - Martin Pluskal + +- Drop emacs support as it leads to creation of build cycle + ------------------------------------------------------------------- Tue Feb 12 13:05:51 UTC 2019 - Dan Čermák diff --git a/cmake.spec b/cmake.spec index 7168c5c..23858ef 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,6 +17,13 @@ %define shortversion 3.13 +# exclude for SLE 12 and Leap 42.x +%if 0%{?suse_version} == 1315 +%define system_libuv OFF +%else +%define system_libuv ON +BuildRequires: libuv-devel >= 1.10 +%endif Name: cmake Version: 3.13.4 Release: 0 @@ -40,24 +47,11 @@ Patch5: system-libs.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch7: feature-suse-python-interp-search-order.patch Patch8: c17-default.patch -BuildRequires: emacs-nox BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel -%if 0%{?suse_version} >= 1330 -BuildRequires: libcurl-mini-devel -%else -BuildRequires: libcurl-devel -%endif BuildRequires: libexpat-devel -# exclude for SLE 12 and Leap 42.x -%if 0%{?suse_version} == 1315 -%define system_libuv OFF -%else -BuildRequires: libuv-devel >= 1.10 -%define system_libuv ON -%endif BuildRequires: ncurses-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 @@ -71,6 +65,11 @@ Requires: make # bnc#953842 - A python file is shipped so require python base so it can be run. Requires: python3-base Recommends: cmake-man +%if 0%{?suse_version} >= 1330 +BuildRequires: libcurl-mini-devel +%else +BuildRequires: libcurl-devel +%endif %description CMake is a cross-platform, open-source build system @@ -118,13 +117,6 @@ do ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions done -# cmake-mode.el -%define cmake_mode_el %{_datadir}/emacs/site-lisp/%{name}-mode.el -install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{cmake_mode_el} -/usr/bin/emacs-nox -batch --no-init-file --no-site-file \ - --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile \ - %{buildroot}%{cmake_mode_el} - %fdupes %{buildroot}%{_datadir}/cmake %check @@ -151,6 +143,5 @@ install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{cmake_mode_el} %{_datadir}/aclocal/cmake.m4 %doc %{_docdir}/%{name} %{_datadir}/bash-completion -%{cmake_mode_el}* %changelog From 451f652e0f85f839003af5923fde801ba8d715425b27be31f0442495da6a8434 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 18 Feb 2019 08:54:21 +0000 Subject: [PATCH 4/4] Accepting request 676950 from home:Andreas_Schwab:Factory - Pass arguments of %ctest macro down to ctest OBS-URL: https://build.opensuse.org/request/show/676950 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=350 --- cmake.changes | 5 +++++ cmake.macros | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake.changes b/cmake.changes index 7f96375..ddbdbb0 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 18 08:42:05 UTC 2019 - schwab@suse.de + +- Pass arguments of %ctest macro down to ctest + ------------------------------------------------------------------- Fri Feb 15 09:22:35 UTC 2019 - Martin Pluskal diff --git a/cmake.macros b/cmake.macros index 7b1057e..0e1a7f7 100644 --- a/cmake.macros +++ b/cmake.macros @@ -56,7 +56,7 @@ %cmake_install \ DESTDIR=%{buildroot} %__builder install -C %__builddir -%ctest \ +%ctest(:-:) \ cd %__builddir \ - %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \ + %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %** \ cd ..