From 4fdb67bff8dd47942a5a1ba76a25ceac8e532e73a55a284c5b64f40f30357f15 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 14 Aug 2017 22:24:29 +0000 Subject: [PATCH] Accepting request 516931 from home:mathletic:branches:devel:tools:building update to 3.9.0 OBS-URL: https://build.opensuse.org/request/show/516931 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=296 --- cmake-3.8.2-SHA-256.txt | 11 --------- cmake-3.8.2-SHA-256.txt.asc | 16 ------------- cmake-3.8.2.tar.gz | 3 --- cmake-3.9.0-SHA-256.txt | 11 +++++++++ cmake-3.9.0-SHA-256.txt.asc | 16 +++++++++++++ cmake-3.9.0.tar.gz | 3 +++ cmake-ImageMagick7.patch | 43 ----------------------------------- cmake-gui.changes | 11 +++++++++ cmake-gui.spec | 9 ++++---- cmake.changes | 45 +++++++++++++++++++++++++++++++++++++ cmake.spec | 7 ++---- 11 files changed, 93 insertions(+), 82 deletions(-) delete mode 100644 cmake-3.8.2-SHA-256.txt delete mode 100644 cmake-3.8.2-SHA-256.txt.asc delete mode 100644 cmake-3.8.2.tar.gz create mode 100644 cmake-3.9.0-SHA-256.txt create mode 100644 cmake-3.9.0-SHA-256.txt.asc create mode 100644 cmake-3.9.0.tar.gz delete mode 100644 cmake-ImageMagick7.patch diff --git a/cmake-3.8.2-SHA-256.txt b/cmake-3.8.2-SHA-256.txt deleted file mode 100644 index d7e07b5..0000000 --- a/cmake-3.8.2-SHA-256.txt +++ /dev/null @@ -1,11 +0,0 @@ -def1741fb795263ff5e1860dc0b98529f2d50455220043d3e7d0d19850e1e572 cmake-3.8.2-Darwin-x86_64.dmg -d164a1fa2a3d2f276c83ab55c7014b14b501b939d1a5a56f6788eb5cddc7acb6 cmake-3.8.2-Darwin-x86_64.tar.gz -bb26b1871f9e5c2fb73476186cc94d03b674608f704b48b94d617340b87b4d73 cmake-3.8.2-Linux-x86_64.sh -33e4851d3219b720f4b64fcf617151168f1bffdf5afad25eb4b7f5f58cee3a08 cmake-3.8.2-Linux-x86_64.tar.gz -2025aaebf98e4be835bb776a79a6d18bea0702521b13e006a5888dd790541b0c cmake-3.8.2-win32-x86.msi -3fa45a8ad473a8e0579ec826b3355f864750a7455987ed425a9c6fdf4820b5f2 cmake-3.8.2-win32-x86.zip -572cc86b3a50a2aa600ad02daffb4f454b5f26d4b7cd2f606fb263d5e5b39de9 cmake-3.8.2-win64-x64.msi -202c2416c964fb7199e5d7ce92336a44c7ba65d5ccca36246f41d7d09bd8ffe2 cmake-3.8.2-win64-x64.zip -c7d6ce2c84501554f11f1594219c44c778ddddbd3c65f6a934a35e5381892ee3 cmake-3.8.2.tar.Z -da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d cmake-3.8.2.tar.gz -4b40927383b84c1a8dfdca55dddfb8431486462c8df3439a74b6b22be135175b cmake-3.8.2.zip diff --git a/cmake-3.8.2-SHA-256.txt.asc b/cmake-3.8.2-SHA-256.txt.asc deleted file mode 100644 index cb45c3a..0000000 --- a/cmake-3.8.2-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlku3dAACgkQLSzvEDSS -FoQlqhAAlUmGBl3XEZXQYYmqdaNlxRqSO2Qu7UHTYDMZMF7HGu7AfEBvzXDEwJHP -E36jgfKIsvgX0zjtVXeDJaDuMhp0o05Rs+XW/uFKRiuYd/nXlMt6QGiZNT8sHOv7 -kZIoLmj4+b7wh/ziYlS4rof1FwGFzgm/kq0jnq+zZrdvfy9EbbzJJyr3UBtfhQJd -7d+nGtlAhe1cY/6DlhrDz5uaOAolz9SY+VZxuwOoqeSYI+3YrP53a2I7Bo5Zca7X -yLC522zwJ9DqQDcyQ6LKNywUx4oMQDEs+qLJY6Di0Pz2HjBIt0eclHaLpRv8Pibq -b1hkrR24zB9M6cx9vQvGSi6yeBdf+cMZYfB33RIuoiqt/ErHlMOj+AuIT5aPRn9i -gMi2WqE+3YzcrFCLyQbMcaelsjTkQYDVBUQEFXojCwneuzmlrpTtZfht+RFQzVdc -7CU0lpFREwgj+wwbDfRKosmqKK6+WIm7w587LGFT9uYpSB6/MWDUbvHaoz3OLveI -dfYqHtHxAzT302d1oziAO848Vuv6ccwijsk3rjdykjJErF88nISnrA/H0gl877ql -rixVkg38tj3OgJM899TG6807q+hrubMh1Sre+8vCwCogAR1TPF2aMnCzbjJkj1yn -sjMg11v9X5dYh8UszCiZ0bq3A5UB88cpQk9xcRLO1OFNcCkyNSs= -=Dsl3 ------END PGP SIGNATURE----- diff --git a/cmake-3.8.2.tar.gz b/cmake-3.8.2.tar.gz deleted file mode 100644 index 99c99e5..0000000 --- a/cmake-3.8.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d -size 7504706 diff --git a/cmake-3.9.0-SHA-256.txt b/cmake-3.9.0-SHA-256.txt new file mode 100644 index 0000000..b4d5c14 --- /dev/null +++ b/cmake-3.9.0-SHA-256.txt @@ -0,0 +1,11 @@ +a522b23ea1a86544f135c1261833975e7d63e6cdfadeb32f8367c485d998ee6a cmake-3.9.0-Darwin-x86_64.dmg +9587e4b54fce34c6c14df563d409389e59c8e7e240f4f191590fd098d83d6562 cmake-3.9.0-Darwin-x86_64.tar.gz +bb8c08501708e7e72647f81efa89809d58e2b30e91da5b5adef943299ca410c0 cmake-3.9.0-Linux-x86_64.sh +e714ddd55ab9be7ec5e4d30ca1ceee5e23406d7d3bf14457a67180cf54d9834a cmake-3.9.0-Linux-x86_64.tar.gz +2d957404399b80ac17ae5b720e49a013e0434f4cfbc89763b0bdd794e186ae6d cmake-3.9.0-win32-x86.msi +9d593839f64b94718a1b75b8519b56ecb959e4d37d406bf2a087e2c1f7a6b89c cmake-3.9.0-win32-x86.zip +de1b80aa6321d58cc96837783451fe90ee206602730942931cc24aff076f6a38 cmake-3.9.0-win64-x64.msi +584f5c58f322481f29fee482b7627751917ec916fd312de7ced6b046bd55c2f5 cmake-3.9.0-win64-x64.zip +cfd004367fa180d08fc7dda98599302d059db11fd0f48c8bae403d50cab8a642 cmake-3.9.0.tar.Z +167701525183dbb722b9ffe69fb525aa2b81798cf12f5ce1c020c93394dfae0f cmake-3.9.0.tar.gz +4bb61705fb183ed3cfeba5548930a2f09737e3969b01565af4a0768463c94966 cmake-3.9.0.zip diff --git a/cmake-3.9.0-SHA-256.txt.asc b/cmake-3.9.0-SHA-256.txt.asc new file mode 100644 index 0000000..e391a7f --- /dev/null +++ b/cmake-3.9.0-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlluObMACgkQLSzvEDSS +FoQjdg//cAKLbW4y1sh2GVMw8bKELgfra5an36Srp0TvXq4ob786E4NsuuZXs65Z +LGKljkPMR0b+qMnZIEk3HZZSUrutKSZ04d3KQkuX7986l0cyLWiWpazoTgDxKefN +UVk9iC6fZ+aO9HoVtBEus+Wq5rvGUO8tVjrbv8qsO+6x2B9zR3WA9c1V/z1NriFG +Pi1i6FS1G74hOvruaJWa60xMwZgGCywlHQDxlnnUbHpFagVBuQsxHZtR9fMr6G7+ +liWKQgWeZkMIuJE7a5aBbFpD0lfryr1KBt8gH5GBeFj7VEQp8yNczXleLBUtOHBh +7ZYMVmHEJzXzHVuMxnj09A7ls3GHLVnfQeAzrONG6XvseyVh19K8pCOcv5F5IFt+ +tav1On3ywM0XwTH1iqaIroRYTlhdjX8J/WbPN9yfwm4Ly8Cjhv+joppcd7H5g9S3 +8hZ8G6dBFEgcIVXA97XDX5mtCcvsbO2JJ4Fu7B8C8SyC2BNKTBWiYpu2MnyID8UO +b3S/1M9RS0z364CR2KBQr8gs7ZExqzIFVosiZh93jhYnIHDkGEH0Zg10bdH9/b6N +xKiCLx0ELpw4vRrHbfIJCtLAIB/cXnJydn7zwVvqOUjdQuVZhtZ+J/0hSGJ30GIF +sjNQBG5S38lA2ehop21leA+fgdH9UpSFzJ5+50xr1rfl8hfezd8= +=S6jh +-----END PGP SIGNATURE----- diff --git a/cmake-3.9.0.tar.gz b/cmake-3.9.0.tar.gz new file mode 100644 index 0000000..9752d1b --- /dev/null +++ b/cmake-3.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167701525183dbb722b9ffe69fb525aa2b81798cf12f5ce1c020c93394dfae0f +size 7691313 diff --git a/cmake-ImageMagick7.patch b/cmake-ImageMagick7.patch deleted file mode 100644 index 6f193b0..0000000 --- a/cmake-ImageMagick7.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: cmake-3.7.2/Modules/FindImageMagick.cmake -=================================================================== ---- cmake-3.7.2.orig/Modules/FindImageMagick.cmake 2017-01-13 15:05:41.000000000 +0100 -+++ cmake-3.7.2/Modules/FindImageMagick.cmake 2017-03-28 11:00:23.197144625 +0200 -@@ -88,13 +88,13 @@ find_package(PkgConfig QUIET) - #--------------------------------------------------------------------- - # Helper functions - #--------------------------------------------------------------------- --function(FIND_IMAGEMAGICK_API component header) -+function(FIND_IMAGEMAGICK_API component header6 header7) - set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE) - - pkg_check_modules(PC_${component} QUIET ${component}) - - find_path(ImageMagick_${component}_INCLUDE_DIR -- NAMES ${header} -+ NAMES ${header6} ${header7} - HINTS - ${PC_${component}_INCLUDEDIR} - ${PC_${component}_INCLUDE_DIRS} -@@ -195,17 +195,17 @@ foreach(component ${ImageMagick_FIND_COM - ) - if(component STREQUAL "Magick++") - FIND_IMAGEMAGICK_API(Magick++ Magick++.h -- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI -+ Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-7.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-7.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-7.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-7.Q8HDRI Magick++-Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) - elseif(component STREQUAL "MagickWand") -- FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h -- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI -+ FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h MagickWand/MagickWand.h -+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-7.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-7.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-7.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-7.Q8HDRI MagickWand-Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) - elseif(component STREQUAL "MagickCore") -- FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h -- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI -+ FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h MagickCore/MagickCore.h -+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-7.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-7.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-7.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-7.Q8HDRI MagickCore-Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) - else() diff --git a/cmake-gui.changes b/cmake-gui.changes index 82c84fc..f6e4ee5 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Aug 14 20:53:04 UTC 2017 - qantas94heavy + +- fix moved .desktop file + +------------------------------------------------------------------- +Tue Aug 8 20:19:15 UTC 2017 - foss@grueninger.de + +- Update to version 3.9.0: + * No changes specific to CMake-GUI + ------------------------------------------------------------------- Tue Jun 6 13:56:14 UTC 2017 - mpluskal@suse.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 1d36864..e5be8ac 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -16,9 +16,9 @@ # -%define shortversion 3.8 +%define shortversion 3.9 Name: cmake-gui -Version: 3.8.2 +Version: 3.9.0 Release: 0 Summary: CMake graphical user interface License: BSD-3-Clause @@ -103,7 +103,8 @@ make VERBOSE=1 %{?_smp_mflags} %install make %{?_smp_mflags} DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_libdir}/cmake -%suse_update_desktop_file CMake Development IDE Tools Qt +%suse_update_desktop_file -r %{name} CMake Development IDE Tools Qt + # delete files that belong to the 'cmake' package rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest} rm -rf %{buildroot}%{_datadir}/cmake @@ -113,7 +114,7 @@ rm -rf %{buildroot}%{_docdir}/cmake %files %defattr(-,root,root) %{_bindir}/cmake-gui -%{_datadir}/applications/CMake.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/mime/packages/cmakecache.xml %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/* diff --git a/cmake.changes b/cmake.changes index 84457da..8187376 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Tue Aug 8 20:20:26 UTC 2017 - foss@grueninger.de + +- update to 3.9.0: + * CMake is now aware of the C and C++ standards and their + associated meta-features for the following compiler ids: + Cray, PGI, and XL. + * The add_library() command IMPORTED option learned to support + Object Libraries. + * All find_ commands now have a PACKAGE_ROOT search path group + that is first in the search heuristics. If a find_ command is + called from inside a find module, then the CMake variable and + environment variable named _ROOT are used as prefixes + and are the first set of paths to be searched. + * The install(TARGETS) command learned a new OBJECTS option to + specify where to install Object Libraries. + * The install(EXPORT) command learned how to export Object + Libraries. + * A BUILD_WITH_INSTALL_NAME_DIR target property and corresponding + CMAKE_BUILD_WITH_INSTALL_NAME_DIR variable were added to control + whether to use the INSTALL_NAME_DIR target property value for + binaries in the build tree. + * A CUDA_PTX_COMPILATION target property was added to Object + Libraries to support compiling to .ptx files instead of host + object files. + * A new GoogleTest module was added to provide the + gtest_add_tests() function independently of the FindGTest + module. The function was also updated to support keyword arguments, + with functionality expanded to allow a test name prefix and suffix + to be specified, the dependency on the source files to be optional + and the list of discovered test cases to be returned to the caller. + * The Ninja generator has loosened the dependencies of object + compilation. Object compilation now depends only on custom targets + and custom commands associated with libraries on which the object’s + target depends and no longer depends on the libraries themselves. + Source files in dependent targets may now compile without waiting + for their targets’ dependencies to link. + * Interprocedural optimization (IPO) is now supported for GNU and + Clang compilers using link time optimization (LTO) flags. See the + INTERPROCEDURAL_OPTIMIZATION target property and + CheckIPOSupported module. + * The TARGET_OBJECTS generator expression is now supported by + the add_custom_command() and file(GENERATE) commands. +- Removed cmake-ImageMagick7.patch which became part of upstream. + ------------------------------------------------------------------- Mon Aug 7 10:27:30 UTC 2017 - coolo@suse.com diff --git a/cmake.spec b/cmake.spec index bd44464..7d3807e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -16,9 +16,9 @@ # -%define shortversion 3.8 +%define shortversion 3.9 Name: cmake -Version: 3.8.2 +Version: 3.9.0 Release: 0 Summary: Cross-platform, open-source make system License: BSD-3-Clause @@ -37,8 +37,6 @@ Patch2: cmake-fix-ruby-test.patch Patch4: form.patch # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs Patch5: system-libs.patch -# PATCH-FIX-UPSTREAM cmake-ImageMagick7.patch -- find also ImageMagick 7 -Patch6: cmake-ImageMagick7.patch %if 0%{?suse_version} >= 1330 BuildRequires: libcurl-mini-devel %else @@ -83,7 +81,6 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU %patch2 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build export CFLAGS="%{optflags}"