Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2016-11-21 14:24:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2016-09-16 10:59:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2016-11-21 14:24:10.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Nov 17 21:25:36 UTC 2016 - sfl...@suse.de + +- Fix typo in libuv detection + +------------------------------------------------------------------- +Wed Nov 16 14:28:58 UTC 2016 - f...@grueninger.de + +- use libuv which is shipped in CMake's tarball for older systems + that do not provide this lib on their own + +------------------------------------------------------------------- +Wed Nov 16 00:03:32 UTC 2016 - f...@grueninger.de + +- update to CMake 3.7.0 + no changes specific to CMake-GUI for Linux + full changelog: https://blog.kitware.com/cmake-3-7-0-available-for-download/ + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2016-11-16 13:47:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2016-11-21 14:24:10.000000000 +0100 @@ -1,0 +2,33 @@ +Fri Nov 18 09:30:47 UTC 2016 - alarr...@suse.com + +- Do not mix tabs and spaces in cmake.prov + +------------------------------------------------------------------- +Wed Nov 16 14:30:02 UTC 2016 - f...@grueninger.de + +- use libuv which is shipped in CMake's tarball for older systems + that do not provide this lib on their own + +------------------------------------------------------------------- +Tue Nov 15 23:42:45 UTC 2016 - f...@grueninger.de + +- update to CMake 3.7.0 + * CMake now supports Cross Compiling for Android with simple + toolchain files. + * The Ninja generator learned to conditionally support Fortran + when using a ninja tool that has the necessary features. + * The try_compile() command source file signature now honors + configuration-specific flags in the generated test project. + * CTest now supports test fixtures through the new FIXTURES_SETUP, + FIXTURES_CLEANUP and FIXTURES_REQUIRED test properties. When using + regular expressions or –rerun-failed to limit the tests to be run, + a fixture’s setup and cleanup tests will automatically be added to + the execution set if any test requires that fixture. + * Vim support files cmake-indent.vim, cmake-syntax.vim, and + cmake-help.vim have been removed in favor of the files now + provided from the vim-cmake-syntax project. + full changelog: https://blog.kitware.com/cmake-3-7-0-available-for-download/ +- drop patch cmake-version-in-generated-files.patch as it is part of 3.7.0 +- update patch cmake-fix-ruby-test.patch + +------------------------------------------------------------------- Old: ---- cmake-3.6.2-SHA-256.txt cmake-3.6.2-SHA-256.txt.asc cmake-3.6.2.tar.gz cmake-version-in-generated-files.patch New: ---- cmake-3.7.0-SHA-256.txt cmake-3.7.0-SHA-256.txt.asc cmake-3.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.43Nq3h/_old 2016-11-21 14:24:11.000000000 +0100 +++ /var/tmp/diff_new_pack.43Nq3h/_new 2016-11-21 14:24:11.000000000 +0100 @@ -17,28 +17,34 @@ Name: cmake-gui -Version: 3.6.2 +Version: 3.7.0 Release: 0 Summary: CMake graphical user interface License: BSD-3-Clause Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v3.6/cmake-%{version}.tar.gz -Source5: http://www.cmake.org/files/v3.6/cmake-%{version}-SHA-256.txt -Source6: http://www.cmake.org/files/v3.6/cmake-%{version}-SHA-256.txt.asc +Source0: http://www.cmake.org/files/v3.7/cmake-%{version}.tar.gz +Source5: http://www.cmake.org/files/v3.7/cmake-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v3.7/cmake-%{version}-SHA-256.txt.asc Source7: cmake.keyring # PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes 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-version-in-generated-files.patch -- version number to be found in OBS -Patch6: cmake-version-in-generated-files.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libexpat-devel BuildRequires: openssl-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 # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 #BuildRequires: pkgconfig(jsoncpp) @@ -72,7 +78,6 @@ %setup -q -n cmake-%{version} %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build export CFLAGS="%{optflags}" @@ -87,7 +92,10 @@ --system-libs \ --no-system-jsoncpp \ --parallel=0%{jobs} \ - --qt-gui + --verbose \ + --qt-gui \ + -- \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib} make VERBOSE=1 %{?_smp_mflags} %install ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.43Nq3h/_old 2016-11-21 14:24:11.000000000 +0100 +++ /var/tmp/diff_new_pack.43Nq3h/_new 2016-11-21 14:24:11.000000000 +0100 @@ -17,33 +17,39 @@ Name: cmake -Version: 3.6.2 +Version: 3.7.0 Release: 0 Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v3.6/%{name}-%{version}.tar.gz +Source0: http://www.cmake.org/files/v3.7/%{name}-%{version}.tar.gz Source1: cmake.macros # bnc#947585 - Let CMake produces automatic RPM provides Source3: cmake.attr Source4: cmake.prov -Source5: http://www.cmake.org/files/v3.6/%{name}-%{version}-SHA-256.txt -Source6: http://www.cmake.org/files/v3.6/%{name}-%{version}-SHA-256.txt.asc +Source5: http://www.cmake.org/files/v3.7/%{name}-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v3.7/%{name}-%{version}-SHA-256.txt.asc Source7: cmake.keyring Patch2: cmake-fix-ruby-test.patch # PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes 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-version-in-generated-files.patch -- version number to be found in OBS -Patch6: cmake-version-in-generated-files.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel BuildRequires: libexpat-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: ncurses-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 @@ -69,7 +75,6 @@ %patch2 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build export CFLAGS="%{optflags}" @@ -84,7 +89,9 @@ --no-system-jsoncpp \ --parallel=0%{jobs} \ --verbose \ - --no-qt-gui + --no-qt-gui \ + -- \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib} make VERBOSE=1 %{?_smp_mflags} %install @@ -107,7 +114,7 @@ # if any other app installs then this test is bogus # suse specific brp-25-symlink cramps the symlinks, hence the CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne) fail ./bin/ctest --force-new-ctest-process --output-on-failure %{?_smp_mflags} \ - -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne))" + -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne)|CPack_RPM)" %files %defattr(-,root,root) ++++++ cmake-3.6.2-SHA-256.txt -> cmake-3.7.0-SHA-256.txt ++++++ --- /work/SRC/openSUSE:Factory/cmake/cmake-3.6.2-SHA-256.txt 2016-09-16 10:59:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-3.7.0-SHA-256.txt 2016-11-21 14:24:10.000000000 +0100 @@ -1,16 +1,11 @@ -09f5bc7493bcd2b0e856295a999cf0d6946050dc7ef9c753e79ddd53f00de23a cmake-3.6.2-Darwin-x86_64.dmg -3875872569f050b674db36793c6e6e2264bd17eaa6c31a700038f48bc1eefcdf cmake-3.6.2-Darwin-x86_64.tar.Z -e3ac82120298095245c9948eb11ddfb4b552f5f056ce0ec3c82e3f3a15c53752 cmake-3.6.2-Darwin-x86_64.tar.gz -222f0c8cc11aec1fd5145a7e467422e9c79065e6bbaa4e0ab7b291b48d8c715a cmake-3.6.2-Linux-i386.sh -2d9dead209e2ef07b029734ed8dbabb683fb3dc080755f1df2ed00cadd978def cmake-3.6.2-Linux-i386.tar.Z -26c2c86ddd54fd143594b6801a677f0a75bbacf7bb006a274d2854d0004f2749 cmake-3.6.2-Linux-i386.tar.gz -f4b8905b90feed3bfa1fac23ef68b76d0f6bbc0374c6048183c7ac536d3013d4 cmake-3.6.2-Linux-x86_64.sh -f4131772a74fa81e450f6fa4ff0ce5a138c3bab72343d293504bd8f77addb169 cmake-3.6.2-Linux-x86_64.tar.Z -5df4b69d9e85093ae78b1070d5cb9f824ce0bdd02528948c3f6a740e240083e5 cmake-3.6.2-Linux-x86_64.tar.gz -3613a4f87eda8bcd5ffb17aaad22499dffff02939a3788e56708a3954868620e cmake-3.6.2-win32-x86.msi -613eec5a8b2e2c49826e0e8e18f516b6f2b481309ae55925d226ce8ab78b0fba cmake-3.6.2-win32-x86.zip -5eb7c09c23b13742161076401bb2f4edabd75ecafe8916c7a401532bc3794dd5 cmake-3.6.2-win64-x64.msi -61337a0528fc3902d7f2f7594959aa6aa48a52863dd2da335a0e248b5eb8acaf cmake-3.6.2-win64-x64.zip -3515b8d77772300d2c438b1320f4d772eb841fc59a2ab4f6d1dc5b12d160c5e0 cmake-3.6.2.tar.Z -189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346 cmake-3.6.2.tar.gz -ccf93db0527c35676ab74319bb3ef1ef4f5149d3b09aab1a58559143c1f4f673 cmake-3.6.2.zip +c5ffa392304bec8fcf08eecfce238356568c792686d839d81cf027f9ab19b312 cmake-3.7.0-Darwin-x86_64.dmg +38ea6955fb8c120eada1ff7985389b61ad5ca60a90a51025024638d92bfb43cf cmake-3.7.0-Darwin-x86_64.tar.gz +e11c0128a9538909e6527df3ac92d9b6620e2c57040be34d72de40a7ad95da47 cmake-3.7.0-Linux-x86_64.sh +e075f63e6a9104b1c3d11666ae9546bc8812f7e791a49c4ce11effc063141b2a cmake-3.7.0-Linux-x86_64.tar.gz +c657a6b3c296ed321a9440c5681b8fb1f17a6fb3ea0be1f91c3c81a730992ad9 cmake-3.7.0-win32-x86.msi +26dc1e0c4e9ba6021ed171463f7c99b241c1c8f8ada4ea652f031ff835c6b928 cmake-3.7.0-win32-x86.zip +c56d59dc74e9baf3879c01bfbc6d999b4b37fab9771aae876bd5f47298ce2cc7 cmake-3.7.0-win64-x64.msi +11a2f8c4d52c5dbb6708a80f54d782fdfb2f5cd96c091ac51500c5607534e660 cmake-3.7.0-win64-x64.zip +a42db3ea60f90454ef7e49e1a081f8c444de806c09fd8f95aaa06727e5dc4675 cmake-3.7.0.tar.Z +ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 cmake-3.7.0.tar.gz +e147c8f95b31b8cb0ef903b39ac21c9f07faf1c2131f7ec54a55e664d70224e7 cmake-3.7.0.zip ++++++ cmake-3.6.2.tar.gz -> cmake-3.7.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/cmake/cmake-3.6.2.tar.gz /work/SRC/openSUSE:Factory/.cmake.new/cmake-3.7.0.tar.gz differ: char 5, line 1 ++++++ cmake-fix-ruby-test.patch ++++++ --- /var/tmp/diff_new_pack.43Nq3h/_old 2016-11-21 14:24:12.000000000 +0100 +++ /var/tmp/diff_new_pack.43Nq3h/_new 2016-11-21 14:24:12.000000000 +0100 @@ -1,6 +1,6 @@ ---- cmake-3.0.0-rc2.orig/Modules/FindRuby.cmake 2014-03-17 19:18:29.000000000 +0100 -+++ cmake-3.0.0-rc2/Modules/FindRuby.cmake 2014-03-20 02:44:47.693351223 +0100 -@@ -118,7 +118,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO +--- 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 @@ _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) # vendor_ruby available ? ++++++ cmake.prov ++++++ --- /var/tmp/diff_new_pack.43Nq3h/_old 2016-11-21 14:24:12.000000000 +0100 +++ /var/tmp/diff_new_pack.43Nq3h/_new 2016-11-21 14:24:12.000000000 +0100 @@ -32,8 +32,8 @@ paths = map(lambda x: x.rstrip(), filelist.readlines()) for path in paths: for (modulePath, cmakeModule, lowercase) in self.parseCmakeModuleConfig(path): - version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) - + version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) + if version: print("cmake(%s) = %s" % (cmakeModule, version)) else: @@ -46,15 +46,15 @@ result = [] for configFile in glob.glob("%s/*Config.cmake" % modulePath): - moduleName = configFile[len(modulePath) + 1:-len("Config.cmake")] - result.append( (modulePath, moduleName, False) ) + moduleName = configFile[len(modulePath) + 1:-len("Config.cmake")] + result.append( (modulePath, moduleName, False) ) for configFile in glob.glob("%s/*-config.cmake" % modulePath): - moduleName = configFile[len(modulePath) + 1:-len("-config.cmake")] + moduleName = configFile[len(modulePath) + 1:-len("-config.cmake")] if (modulePath, moduleName, False) not in result: - result.append( (modulePath, moduleName, True) ) + result.append( (modulePath, moduleName, True) ) - return result + return result def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase): versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)
