Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2018-05-16 11:25:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Wed May 16 11:25:45 2018 rev:145 rq:605952 version:3.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2018-03-20 21:53:04.653415017 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2018-05-16 11:25:53.454559729 +0200 @@ -1,0 +2,18 @@ +Wed May 9 22:37:12 UTC 2018 - f...@grueninger.de + +- Updateo to 3.11.1 + * No changes specific to CMake-GUI + +------------------------------------------------------------------- +Wed Apr 4 10:46:28 UTC 2018 - mplus...@suse.com + +- Cleanup spec file with spec-clener +- Drop conditions for building on Leap + +------------------------------------------------------------------- +Wed Mar 28 22:41:54 UTC 2018 - f...@grueninger.de + +- Updateo to 3.11.0 + * No changes specific to CMake-GUI + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2018-03-20 21:53:04.705413144 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2018-05-16 11:25:53.518557404 +0200 @@ -1,0 +2,39 @@ +Wed May 9 22:33:46 UTC 2018 - f...@grueninger.de + +- update to 3.11.1 + * Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES" + * Restore support for explicitly referenced CMakeLists.txt sources + * Exclude "libgcc_eh" library files from implicit link libraries + full changelog https://cmake.org/cmake/help/v3.11/release/3.11.html#id1 +- Adapted system-libs.patch + +------------------------------------------------------------------- +Mon Apr 16 10:19:27 UTC 2018 - h...@urpla.net + +- allow build with curl libs from older distributions +- refresh patches + +------------------------------------------------------------------- +Wed Apr 4 10:46:49 UTC 2018 - mplus...@suse.com + +- Cleanup spec file with spec-cleaner +- Drop conditions for building on Leap + +------------------------------------------------------------------- +Wed Mar 28 22:27:12 UTC 2018 - f...@grueninger.de + +- Updated to 3.11.0 + * The Makefile Generators and the Ninja generator learned to add + compiler launcher tools + * The COMPILE_DEFINITIONS source file property learned to support + generator expressions. + * COMPILE_OPTIONS source file property was added to manage list + of options to pass to the compiler. + * A new FetchContent module was added which supports populating + content at configure time using any of the download/update + methods supported by ExternalProject_Add(). + full changelog: https://cmake.org/cmake/help/v3.11/release/3.11.html +- Adapted form.patch and c17-default.patch +- Drop cmake-3.10.1_boost-1.66.patch as it is included in upstream + +------------------------------------------------------------------- Old: ---- cmake-3.10.1_boost-1.66.patch cmake-3.10.3-SHA-256.txt cmake-3.10.3-SHA-256.txt.asc cmake-3.10.3.tar.gz New: ---- cmake-3.11.1-SHA-256.txt cmake-3.11.1-SHA-256.txt.asc cmake-3.11.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.Y3Qf6I/_old 2018-05-16 11:25:55.338491279 +0200 +++ /var/tmp/diff_new_pack.Y3Qf6I/_new 2018-05-16 11:25:55.342491133 +0200 @@ -16,14 +16,14 @@ # -%define shortversion 3.10 +%define shortversion 3.11 Name: cmake-gui -Version: 3.10.3 +Version: 3.11.1 Release: 0 Summary: CMake graphical user interface License: BSD-3-Clause Group: Development/Tools/Building -Url: https://www.cmake.org/ +URL: https://www.cmake.org/ Source0: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz Source5: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt Source6: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt.asc @@ -37,22 +37,15 @@ BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libexpat-devel -BuildRequires: openssl-devel -BuildRequires: rhash-devel -# use libuv package for Leap and Tumbleweed -%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})) BuildRequires: libuv-devel -%define use_system_uvlib ON -# otherwise use libuv part of CMake tarball -%else -%define use_system_uvlib OFF -%endif +BuildRequires: openssl-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 #BuildRequires: pkgconfig(jsoncpp) #endif BuildRequires: pkgconfig BuildRequires: python-sphinx +BuildRequires: rhash-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt5Widgets) @@ -96,7 +89,7 @@ --verbose \ --qt-gui \ -- \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib} + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON make VERBOSE=1 %{?_smp_mflags} %install ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.Y3Qf6I/_old 2018-05-16 11:25:55.378489825 +0200 +++ /var/tmp/diff_new_pack.Y3Qf6I/_new 2018-05-16 11:25:55.382489681 +0200 @@ -16,14 +16,14 @@ # -%define shortversion 3.10 +%define shortversion 3.11 Name: cmake -Version: 3.10.3 +Version: 3.11.1 Release: 0 Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building -Url: https://www.cmake.org/ +URL: https://www.cmake.org/ Source0: https://www.cmake.org/files/v%{shortversion}/%{name}-%{version}.tar.gz Source1: cmake.macros # bnc#947585 - Let CMake produces automatic RPM provides @@ -37,35 +37,27 @@ Patch4: form.patch # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs Patch5: system-libs.patch -Patch6: cmake-3.10.1_boost-1.66.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 -%if 0%{?suse_version} >= 1330 -BuildRequires: libcurl-mini-devel -%else -BuildRequires: curl-devel -%endif BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel -BuildRequires: libexpat-devel -BuildRequires: rhash-devel -# use libuv package for Leap and Tumbleweed -%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})) -BuildRequires: libuv-devel -%define use_system_uvlib ON -# otherwise use libuv part of CMake tarball +%if 0%{?suse_version} >= 1330 +BuildRequires: libcurl-mini-devel %else -%define use_system_uvlib OFF +BuildRequires: libcurl-devel %endif +BuildRequires: libexpat-devel +BuildRequires: libuv-devel BuildRequires: ncurses-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 #BuildRequires: pkgconfig(jsoncpp) #endif BuildRequires: pkgconfig +BuildRequires: rhash-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(liblzma) Requires: make @@ -98,7 +90,7 @@ --verbose \ --no-qt-gui \ -- \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib} + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON make VERBOSE=1 %{?_smp_mflags} %install ++++++ c17-default.patch ++++++ --- /var/tmp/diff_new_pack.Y3Qf6I/_old 2018-05-16 11:25:55.418488373 +0200 +++ /var/tmp/diff_new_pack.Y3Qf6I/_new 2018-05-16 11:25:55.418488373 +0200 @@ -1,8 +1,8 @@ -Index: cmake-3.10.2/Modules/CMakeCCompilerId.c.in +Index: b/Modules/CMakeCCompilerId.c.in =================================================================== ---- cmake-3.10.2.orig/Modules/CMakeCCompilerId.c.in -+++ cmake-3.10.2/Modules/CMakeCCompilerId.c.in -@@ -39,6 +39,8 @@ char const *info_cray = "INFO" ":" "comp +--- a/Modules/CMakeCCompilerId.c.in ++++ b/Modules/CMakeCCompilerId.c.in +@@ -40,6 +40,8 @@ char const *info_cray = "INFO" ":" "comp # else # define C_DIALECT # endif @@ -11,21 +11,21 @@ #elif __STDC_VERSION__ >= 201000L # define C_DIALECT "11" #elif __STDC_VERSION__ >= 199901L -Index: cmake-3.10.2/Modules/Compiler/GNU-C.cmake +Index: b/Modules/Compiler/GNU-C.cmake =================================================================== ---- cmake-3.10.2.orig/Modules/Compiler/GNU-C.cmake -+++ cmake-3.10.2/Modules/Compiler/GNU-C.cmake +--- a/Modules/Compiler/GNU-C.cmake ++++ b/Modules/Compiler/GNU-C.cmake @@ -22,4 +22,4 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VER set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x") endif() -__compiler_check_default_language_standard(C 3.4 90 5.0 11) +__compiler_check_default_language_standard(C 3.4 90 5.0 11 8.0 17) -Index: cmake-3.10.2/Source/cmLocalGenerator.cxx +Index: b/Source/cmLocalGenerator.cxx =================================================================== ---- cmake-3.10.2.orig/Source/cmLocalGenerator.cxx -+++ cmake-3.10.2/Source/cmLocalGenerator.cxx -@@ -1575,6 +1575,7 @@ void cmLocalGenerator::AddCompilerRequir +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx +@@ -1566,6 +1566,7 @@ void cmLocalGenerator::AddCompilerRequir langStdMap["CXX"].push_back("11"); langStdMap["CXX"].push_back("98"); @@ -33,11 +33,11 @@ langStdMap["C"].push_back("11"); langStdMap["C"].push_back("99"); langStdMap["C"].push_back("90"); -Index: cmake-3.10.2/Source/cmMakefile.cxx +Index: b/Source/cmMakefile.cxx =================================================================== ---- cmake-3.10.2.orig/Source/cmMakefile.cxx -+++ cmake-3.10.2/Source/cmMakefile.cxx -@@ -4077,7 +4077,7 @@ static const char* const CXX_FEATURES[] +--- a/Source/cmMakefile.cxx ++++ b/Source/cmMakefile.cxx +@@ -4161,7 +4161,7 @@ static const char* const CXX_FEATURES[] FEATURE_STRING) }; #undef FEATURE_STRING @@ -46,10 +46,10 @@ static const char* const CXX_STANDARDS[] = { "98", "11", "14", "17" }; bool cmMakefile::AddRequiredTargetFeature(cmTarget* target, -Index: cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt +Index: b/Tests/CompileFeatures/CMakeLists.txt =================================================================== ---- cmake-3.10.2.orig/Tests/CompileFeatures/CMakeLists.txt -+++ cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt +--- a/Tests/CompileFeatures/CMakeLists.txt ++++ b/Tests/CompileFeatures/CMakeLists.txt @@ -214,6 +214,7 @@ if (C_expected_features) if (std_flag_idx EQUAL -1) add_executable(default_dialect_C default_dialect.c) @@ -58,18 +58,18 @@ DEFAULT_C11=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},11> DEFAULT_C99=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},99> DEFAULT_C90=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},90> -Index: cmake-3.10.2/Tests/CompileFeatures/default_dialect.c +Index: b/Tests/CompileFeatures/default_dialect.c =================================================================== ---- cmake-3.10.2.orig/Tests/CompileFeatures/default_dialect.c -+++ cmake-3.10.2/Tests/CompileFeatures/default_dialect.c +--- a/Tests/CompileFeatures/default_dialect.c ++++ b/Tests/CompileFeatures/default_dialect.c @@ -1,5 +1,9 @@ -#if DEFAULT_C11 +#if DEFAULT_C17 -+#if __STDC_VERSION__ != 201710L ++#if __STDC_VERSION__ < 201710L +#error Unexpected value for __STDC_VERSION__. +#endif +#elif DEFAULT_C11 - #if __STDC_VERSION__ != 201112L + #if __STDC_VERSION__ < 201112L #error Unexpected value for __STDC_VERSION__. #endif ++++++ cmake-3.10.3-SHA-256.txt -> cmake-3.11.1-SHA-256.txt ++++++ --- /work/SRC/openSUSE:Factory/cmake/cmake-3.10.3-SHA-256.txt 2018-03-20 21:53:04.341426251 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-3.11.1-SHA-256.txt 2018-05-16 11:25:48.634734849 +0200 @@ -1,11 +1,11 @@ -c0fac18cee8c15d04812740fe70f454f0a6b42d374b6908cf0ceb4bf2fcdcaf8 cmake-3.10.3-Darwin-x86_64.dmg -e88d31a5200274407b7ea83cb2195ffc18cd6ceb1278b36c0501be6a118039a8 cmake-3.10.3-Darwin-x86_64.tar.gz -3973fd56fd993bcbeb629841d84e9540118f015089d6b15591ddbba8d95ee3e3 cmake-3.10.3-Linux-x86_64.sh -9e7c48b797484f74c5ee3ae55132b40b16ed8e81ee762402da8971205b0a896b cmake-3.10.3-Linux-x86_64.tar.gz -8ca3a659fb4eac567dc0b62f4315c0a23f65e15c337a54c12176df81ad86655c cmake-3.10.3-win32-x86.msi -edbbfb7f6f4e4f913de4a16d228cf6156ac7071596b6d25f2891a60a006735ea cmake-3.10.3-win32-x86.zip -0426c9509099dd7e2341443a5121a452c96d94466747383f1727d8c58af03df3 cmake-3.10.3-win64-x64.msi -3bd57d1cfcf720a4cc72db77bda4c76a7b700fb0341821ad868963ad28856cd0 cmake-3.10.3-win64-x64.zip -bd1d6e3649c367893e38958ae17d342707086bc694ec038b34b7c6fe303be5b6 cmake-3.10.3.tar.Z -0c3a1dcf0be03e40cf4f341dda79c96ffb6c35ae35f2f911845b72dab3559cf8 cmake-3.10.3.tar.gz -01d564ea7558910ed1e5575b772c595a003dd3ad58f11dae4cbb34121f4b2793 cmake-3.10.3.zip +26592a607263b0270c2792f569aeb63168e2e1e1dead0bd5e57d4c868356bae5 cmake-3.11.1-Darwin-x86_64.dmg +75f441052d64edcfd869882a5c6baed8d8280420114959313e68b344e24309c4 cmake-3.11.1-Darwin-x86_64.tar.gz +b2d8028ff11727dbca4f1c2cd56d9d8b54698ee112aacf46ab199075c31813f6 cmake-3.11.1-Linux-x86_64.sh +3aa8d3b53903563bdc13dfec80716c286b2228db36ef65c23bc616f9bb930367 cmake-3.11.1-Linux-x86_64.tar.gz +ec44e70bda43759e76f48d0f33ab214753b6e4b29b282d09e2dc13512fc66bd4 cmake-3.11.1-win32-x86.msi +415a24c0c1250514747ea3c1d45b1930bc51dc5d6acb01062e1d680051bb0ea9 cmake-3.11.1-win32-x86.zip +13544e606d65bbca352768d78dbaa4f387c4c44f8b605d033406eb0c199aff95 cmake-3.11.1-win64-x64.msi +ed23c3d22e164fae7300c82db3e72eac4648e016eabdeace1bd573a9a6ecd218 cmake-3.11.1-win64-x64.zip +acd4fd0b687ef0a32596bcc8d63da730ce0f299c0ae3885fa6c9f5d4fad46096 cmake-3.11.1.tar.Z +57bebc6ca4d1d42c6385249d148d9216087e0fda57a47dc5c858790a70217d0c cmake-3.11.1.tar.gz +3beef1e00c7b595258f97a2c10a28332d4a39ced59927f9ab7d0680779c66f28 cmake-3.11.1.zip ++++++ cmake-3.10.3.tar.gz -> cmake-3.11.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/cmake/cmake-3.10.3.tar.gz /work/SRC/openSUSE:Factory/.cmake.new/cmake-3.11.1.tar.gz differ: char 6, line 1 ++++++ cmake-fix-ruby-test.patch ++++++ --- /var/tmp/diff_new_pack.Y3Qf6I/_old 2018-05-16 11:25:55.498485466 +0200 +++ /var/tmp/diff_new_pack.Y3Qf6I/_new 2018-05-16 11:25:55.498485466 +0200 @@ -1,6 +1,8 @@ ---- a/Modules/FindRuby.cmake 2016-11-15 23:00:54.832228081 +0100 -+++ b/Modules/FindRuby.cmake 2016-11-15 23:01:55.201700739 +0100 -@@ -107,7 +107,7 @@ +Index: b/Modules/FindRuby.cmake +=================================================================== +--- a/Modules/FindRuby.cmake ++++ b/Modules/FindRuby.cmake +@@ -110,7 +110,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) # vendor_ruby available ? ++++++ form.patch ++++++ --- /var/tmp/diff_new_pack.Y3Qf6I/_old 2018-05-16 11:25:55.574482705 +0200 +++ /var/tmp/diff_new_pack.Y3Qf6I/_new 2018-05-16 11:25:55.578482559 +0200 @@ -3,7 +3,7 @@ --- a/Source/CursesDialog/CMakeLists.txt +++ b/Source/CursesDialog/CMakeLists.txt @@ -17,7 +17,7 @@ - CursesDialog/ccmake + CursesDialog/ccmake.cxx ) -include_directories(${CURSES_INCLUDE_PATH}) ++++++ system-libs.patch ++++++ --- /var/tmp/diff_new_pack.Y3Qf6I/_old 2018-05-16 11:25:55.590482123 +0200 +++ /var/tmp/diff_new_pack.Y3Qf6I/_new 2018-05-16 11:25:55.594481978 +0200 @@ -1,15 +1,17 @@ ---- cmake-3.5.0/bootstrap.old -+++ cmake-3.5.0/bootstrap -@@ -724,10 +724,10 @@ +Index: b/bootstrap +=================================================================== +--- a/bootstrap ++++ b/bootstrap +@@ -803,10 +803,10 @@ while test $# != 0; do --init=*) cmake_init_file=`cmake_arg "$1"` ;; --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; -- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma) -+ --system-bzip2|--system-curl|--system-expat|--system-from|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma) +- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-libuv) ++ --system-bzip2|--system-curl|--system-expat|--system-from|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-libuv) lib=`cmake_arg "$1" "--system-"` cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; -- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma) -+ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma) +- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-libuv) ++ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-libuv) lib=`cmake_arg "$1" "--no-system-"` cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;; --qt-gui) cmake_bootstrap_qt_gui="1" ;;
