From 1b23c6f245f336f6d8a6d432df44c2b9a21ec616972afc74c70b52f850ac80bb Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Tue, 26 Nov 2019 22:21:55 +0000 Subject: [PATCH] Accepting request 751146 from home:mathletic:branches:devel:tools:building - update to CMake 3.16 OBS-URL: https://build.opensuse.org/request/show/751146 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=388 --- cmake-3.15.5-SHA-256.txt | 11 ----------- cmake-3.15.5-SHA-256.txt.asc | 16 ---------------- cmake-3.15.5.tar.gz | 3 --- cmake-3.16.0-SHA-256.txt | 10 ++++++++++ cmake-3.16.0-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.16.0.tar.gz | 3 +++ cmake.changes | 7 +++++++ cmake.spec | 6 ++---- form.patch | 13 ------------- 9 files changed, 38 insertions(+), 47 deletions(-) delete mode 100644 cmake-3.15.5-SHA-256.txt delete mode 100644 cmake-3.15.5-SHA-256.txt.asc delete mode 100644 cmake-3.15.5.tar.gz create mode 100644 cmake-3.16.0-SHA-256.txt create mode 100644 cmake-3.16.0-SHA-256.txt.asc create mode 100644 cmake-3.16.0.tar.gz delete mode 100644 form.patch diff --git a/cmake-3.15.5-SHA-256.txt b/cmake-3.15.5-SHA-256.txt deleted file mode 100644 index d7422b1..0000000 --- a/cmake-3.15.5-SHA-256.txt +++ /dev/null @@ -1,11 +0,0 @@ -27ebcfd64c2b331db013906e283decd55a581163df3dd4546dd62a985b7df2cd cmake-3.15.5-Darwin-x86_64.dmg -b7cc7b3e2b3941eac922b9e788f058e985dfdc361d543d62f641ecc1fe0451b9 cmake-3.15.5-Darwin-x86_64.tar.gz -62e3e7d134a257e13521e306a9d3d1181ab99af8fcae66699c8f98754fc02dda cmake-3.15.5-Linux-x86_64.sh -03cfd669d0f990040ec89bb63a3ae7f6d61fd17c1c4d5e7ec3d1a35fe1f043f0 cmake-3.15.5-Linux-x86_64.tar.gz -3b4a0cf190a7088280fd65410451c8b7fa662169d5d297235383eff586841193 cmake-3.15.5-win32-x86.msi -54df7fcc47f1ea8b1c7400f9267eea1cac89b4a4dc0a806e9a89decfd97eabbc cmake-3.15.5-win32-x86.zip -7251f0bcc7df97ef875c9114fb483355ddc2045643ba1ce5ae7ac5fd4c6e066f cmake-3.15.5-win64-x64.msi -973f83503d5e79eafc10446b3cdaf70d5089eb001d72e995df2b22b66800aeb7 cmake-3.15.5-win64-x64.zip -38c7831a3062dc63673d28a432ba8c8e6effc10b99d959f7d2ef0e618e530271 cmake-3.15.5.tar.Z -fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4 cmake-3.15.5.tar.gz -224ee8a2715011a91f404d99501dea31a8baa9ffff5aa88060f6efd12feba967 cmake-3.15.5.zip diff --git a/cmake-3.15.5-SHA-256.txt.asc b/cmake-3.15.5-SHA-256.txt.asc deleted file mode 100644 index ea1e91b..0000000 --- a/cmake-3.15.5-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl25olMACgkQLSzvEDSS -FoTLYg//dFliQ0z1Ew/7b2drET+3tuKN5+eEl+JT0wrzF67RVgxhMnI6McqiDeIk -3lSw7ZPsFVVqXaP8WPD3Z10F2KtYRDLU/rLZbX8NSEFo/QyRsJyNnSTCb/zVofbX -FEOBQoTIpaX3KuR/70fRYghwn1iKf/Ld1wgFQjtLRME3zu0SglZlaZCuhGZi0CK4 -NY/zKEYDIInXy7LLFcRdo2sittn7hjewM8ys2SC3wgfWDwpCr4DHfVLjYgdc4iTj -Eh5xLEusHMkRrZBEzUSz+vPpHfre+aMYsYSDuOOxgPac7Z5+kbdIDcd2x/7qZ6ad -BMFw56k6hAXPQ91EEKHYxvWZf55eeS56Huw9fx/voc+XnM/G+xERgaSIdN277iOU -8JymHxYk3EtlG5CzBnPSa2e9WHCt783UP2DXhtuzg0GOHhLniutF1BXYSIFx08du -cDZL3gQR96a2ZJ/JMkZVarDWJ2InRUBpgQEWDYtlPzq9BvXq+1ugb/SxMprRgttV -+7yfrYbsW8e2thgGLVtB0rZK+fuccdZN9yiivIErMH7VAqWRxK36cf4cPC7wZU9f -AE7tVPJ6SAp4h+t/J6ONe6fMSv/v3FUhtMh5+YDmS4lLrBhII5KnGy/wiTyCGOKb -D9+xb+oW6T2xw/H9aSQeV/SmQGbwSEFPoC/F6CkZTh8jPSxenic= -=wT5l ------END PGP SIGNATURE----- diff --git a/cmake-3.15.5.tar.gz b/cmake-3.15.5.tar.gz deleted file mode 100644 index 875ca1e..0000000 --- a/cmake-3.15.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4 -size 9271925 diff --git a/cmake-3.16.0-SHA-256.txt b/cmake-3.16.0-SHA-256.txt new file mode 100644 index 0000000..f936a44 --- /dev/null +++ b/cmake-3.16.0-SHA-256.txt @@ -0,0 +1,10 @@ +51797467e8cd35c3c8d96970b5eab6e33702f3060f2b7a986f2d05536a269710 cmake-3.16.0-Darwin-x86_64.dmg +aa5221fb0be10088a47314546b7be5767056cb10fc2cbf64d18a374f25b226ce cmake-3.16.0-Darwin-x86_64.tar.gz +c87dc439a8d6b1b368843c580f0f92770ed641af8ff8fe0b706cfa79eed3ac91 cmake-3.16.0-Linux-x86_64.sh +85f55f13c922c853049edcf37c828b02b9b2fc00729d0cbb56cf20181a39340b cmake-3.16.0-Linux-x86_64.tar.gz +b68a443a2c2cbaa929c570e3d9e3432b531ac3f64050611d82ae037531656f8a cmake-3.16.0-win32-x86.msi +710e96a01a133bc8a077fb68ce4b4b960f61d9ec269fb4d2e0c7ce2950303643 cmake-3.16.0-win32-x86.zip +067b1d3b203e0cb7da3549c2e04986e8eed0bd7002f14731569e3aae3d1f81f0 cmake-3.16.0-win64-x64.msi +2311572c96c3902cff0c42f807c08d07abd44dc981b80bbafa916e1c1be5072b cmake-3.16.0-win64-x64.zip +6da56556c63cab6e9a3e1656e8763ed4a841ac9859fefb63cbe79472e67e8c5f cmake-3.16.0.tar.gz +64ae0f6c4e7563cddaa278501cb5019f994d73fc6f1432eb57456beafa093fc5 cmake-3.16.0.zip diff --git a/cmake-3.16.0-SHA-256.txt.asc b/cmake-3.16.0-SHA-256.txt.asc new file mode 100644 index 0000000..e94167b --- /dev/null +++ b/cmake-3.16.0-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl3dQv8ACgkQLSzvEDSS +FoQBeBAAkZ5H0DV64GJS2lh3hSs7mJ+DXSfM/cYMfaJqxNHc+llmCPo/7+E2cUkX +wz8kQFM0/XWUtwebdGZsZk2tNjzoKV8N18WGZ52zq4eZ0592x3zagqgoQljBu7AR +T98H3lnacCVExe/N+CjHy2IOsMtIuQsBDze/ObcEQ+sqVYNwa+XIHqnM8F07PhAf +q0c1dyNE4QeTQNkJasABPq3ALAx+T2RL/CCx/QRXs58dY/VfJsQxBGmlPBV0r7Uj +lUPvEKmvqiC3s/CISh8SKBtIGCWST6X64dku8m9SSjXCElxE5acr8KHnt2T/aqqu +xUZnvvBHcbl822I4YKTMRqmRnVc3YAARfyRGvaFashTHO2vP/dODfwXI+O6rPVQS +f1nSl5E6cHzSj2a/ZRlEzuaFHOebxItSUTQPufXulMafF8ae1aI6LvYcr5pn2ETb +rAxXXgp/neGj2HC2Mq1ijD7maBFnzFWbmWCt6+X+paRSfBmRWbpAzfY30D3aUyTk +drcyNx0aHhdgT6DjE7H1RATv9mEMlapM03nq1FpBfoQRL/UdYoIMMq18Ubn2xWu8 +XavqfzDT4s59TApkL7B5rE6AWm3eMoX74Hxr6MbrZvDwferh4SJXbCczmpz2Mad3 +2/s7epNUT90Tk/DmVlTd0Ck2pBBpj4fRYoViHMWvCCLM0bzlcUI= +=ycsN +-----END PGP SIGNATURE----- diff --git a/cmake-3.16.0.tar.gz b/cmake-3.16.0.tar.gz new file mode 100644 index 0000000..0c6e128 --- /dev/null +++ b/cmake-3.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6da56556c63cab6e9a3e1656e8763ed4a841ac9859fefb63cbe79472e67e8c5f +size 9107654 diff --git a/cmake.changes b/cmake.changes index 6879d0d..5e8116b 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 26 20:16:48 UTC 2019 - Christoph G + +- update to CMake 3.16 + Changelog see https://blog.kitware.com/cmake-3-16-0-available-for-download/ +- drop patch form.patch, fixed upstream + ------------------------------------------------------------------- Wed Nov 13 13:48:07 UTC 2019 - Martin Pluskal diff --git a/cmake.spec b/cmake.spec index 7530559..0d307a9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -24,9 +24,9 @@ %define psuffix %{nil} %bcond_with gui %endif -%define shortversion 3.15 +%define shortversion 3.16 Name: cmake%{psuffix} -Version: 3.15.5 +Version: 3.16.0 Release: 0 URL: https://www.cmake.org/ Source0: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz @@ -38,8 +38,6 @@ Source5: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SH Source6: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt.asc Source7: cmake.keyring Patch1: cmake-fix-ruby-test.patch -# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes -Patch2: form.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch3: feature-suse-python-interp-search-order.patch BuildRequires: fdupes diff --git a/form.patch b/form.patch deleted file mode 100644 index 6b0809a..0000000 --- a/form.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt -index 7d4e88c..0cc5357 100644 ---- a/Source/CursesDialog/CMakeLists.txt -+++ b/Source/CursesDialog/CMakeLists.txt -@@ -17,7 +17,7 @@ - CursesDialog/ccmake.cxx - ) - --include_directories(${CURSES_INCLUDE_PATH}) -+include_directories(${CURSES_INCLUDE_PATH}/ncurses/) - - - add_executable(ccmake ${CURSES_SRCS} )