Hello community, here is the log from the commit of package cmake for openSUSE:Leap:15.2 checked in at 2020-03-20 05:52:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/cmake (Old) and /work/SRC/openSUSE:Leap:15.2/.cmake.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Fri Mar 20 05:52:36 2020 rev:37 rq:782201 version:3.16.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/cmake/cmake.changes 2020-01-30 14:46:47.298787195 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.cmake.new.3160/cmake.changes 2020-03-20 05:52:48.164059340 +0100 @@ -1,0 +2,71 @@ +Wed Feb 19 13:30:34 UTC 2020 - Dominique Leuenberger <dims...@opensuse.org> + +- Change cmake to be a meta-package that requires + cmake-implementation. This new symbol is provided by the (newly + named) cmake-full package as well as cmake-mini. +- This is needed as the original attempt of using Substitute in OBS + actually rewrites the used spec files on disk, not only on the + fly and we ended up with packages Requiring cmake-mini (which is + not installable on end user systems). + +------------------------------------------------------------------- +Mon Feb 10 15:26:56 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Revert LIBDIR change in macros - it is inconsistent (all other + INSTALL_<dir>s use absolute paths), unneeded (paths may be + absolute or relative), and breaks a number of packages. +- Update minimum libarchive version, >= 3.3.3. +- Do not flag macros as config file. +- Adjust constraints (7G disk space is required, independent + of architecture). + +------------------------------------------------------------------- +Fri Feb 7 02:11:06 UTC 2020 - Simon Lees <sfl...@suse.de> + +- Revert "use cmake generics in marcos.cmake" it breaks many + cases in stagings. + +------------------------------------------------------------------- +Wed Feb 5 12:50:16 UTC 2020 - Tomáš Chvátal <tchva...@suse.com> + +- Add new -mini flavor in order to break up cycles + * make sure the default cmake links now all system libraries + and mini uses bundled stuff as needed +- Switch to python3 variant of Sphinx on the manpage/docu creation + +------------------------------------------------------------------- +Tue Jan 14 23:14:08 UTC 2020 - Christoph Junghans <jungh...@votca.org> + +- use cmake generics in marcos.cmake + +------------------------------------------------------------------- +Tue Jan 14 07:36:33 UTC 2020 - Andreas Schneider <a...@cryptomilk.org> + +- Fix setting CMAKE_INSTALL_LIBDIR in cmake macro + * This is a relative path, see `cmake --help-module GNUInstallDirs` +- Do NOT set -DCMAKE_SKIP_RPATH:BOOL=OFF + * A lot of applications have private libraries in a subdirectory + and require linking with RPATH which is totally valid. + +------------------------------------------------------------------- +Fri Dec 20 10:09:57 UTC 2019 - Christoph G <f...@grueninger.de> + +- update to CMAke 3.16.2 + * FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX + * FindBoost: Add support for Boost 1.72 + * FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries + Full changelog see https://blog.kitware.com/cmake-3-16-2-available-for-download/ + +------------------------------------------------------------------- +Wed Nov 27 00:00:25 UTC 2019 - Simon Lees <sfl...@suse.de> + +- Fix numbering of patches. + +------------------------------------------------------------------- +Tue Nov 26 20:16:48 UTC 2019 - Christoph G <f...@grueninger.de> + +- update to CMake 3.16 + Changelog see https://blog.kitware.com/cmake-3-16-0-available-for-download/ +- drop patch form.patch, fixed upstream + +------------------------------------------------------------------- Old: ---- cmake-3.15.5-SHA-256.txt cmake-3.15.5-SHA-256.txt.asc cmake-3.15.5.tar.gz form.patch New: ---- README.SUSE cmake-3.16.2-SHA-256.txt cmake-3.16.2-SHA-256.txt.asc cmake-3.16.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.3c8S8G/_old 2020-03-20 05:52:48.756059734 +0100 +++ /var/tmp/diff_new_pack.3c8S8G/_new 2020-03-20 05:52:48.760059736 +0100 @@ -1,7 +1,7 @@ # # spec file for package cmake # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,16 +18,30 @@ %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "gui" -%define psuffix -gui +%define psuffix -ui %bcond_without gui %else -%define psuffix %{nil} %bcond_with gui %endif -%define shortversion 3.15 -Name: cmake%{psuffix} -Version: 3.15.5 +%if "%{flavor}" == "mini" +%define psuffix -mini +%bcond_without mini +%else +%bcond_with mini +%endif +%if "%{flavor}" == "full" +%define psuffix -full +%bcond_without full +%else +%bcond_with full +%endif + +%define shortversion 3.16 +Name: cmake%{?psuffix} +Version: 3.16.2 Release: 0 +Summary: Cross-platform make system +License: BSD-3-Clause URL: https://www.cmake.org/ Source0: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz Source1: cmake.macros @@ -37,60 +51,63 @@ 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 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 +Source99: README.SUSE +Patch0: cmake-fix-ruby-test.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 +Patch1: feature-suse-python-interp-search-order.patch BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: libcurl-mini-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: pkgconfig(bzip2) BuildRequires: pkgconfig(expat) -BuildRequires: pkgconfig(libarchive) >= 3.0.2 BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(libuv) >= 1.10 BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(zlib) +%if "%{flavor}" == "" +Requires: cmake-implementation = %{version} +%endif +%if %{with full} || %{with mini} Requires: make -%if %{with gui} -Summary: CMake graphical user interface -License: BSD-3-Clause -%else -Summary: Cross-platform make system -License: BSD-3-Clause +# bnc#953842 - A python file is shipped so require python base so it can be run. +Requires: python3-base +Conflicts: cmake-implementation +Provides: cmake-implementation = %{version} +%endif +%if %{with mini} +Requires: this-is-only-for-build-envs +%endif +%if %{with full} || %{with gui} +BuildRequires: pkgconfig(jsoncpp) >= 1.4.1 +BuildRequires: pkgconfig(libarchive) >= 3.3.3 +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libzstd) %endif %if %{with gui} -BuildRequires: python-sphinx +BuildRequires: python3-Sphinx BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Widgets) -Requires: cmake -Recommends: cmake-man -%else -# bnc#953842 - A python file is shipped so require python base so it can be run. -Requires: python3-base %endif +%description +CMake is a cross-platform build system. + %package -n cmake-man Summary: Manual pages for cmake, a cross-platform make system +Supplements: cmake %description -n cmake-man Manual pages for cmake, a cross-platform make system. -%if %{with gui} -%description +%package -n cmake-gui +Summary: CMake graphical user interface +Requires: cmake + +%description -n cmake-gui This is a Graphical User Interface for CMake, a cross-platform build system. -%else -%description -CMake is a cross-platform build system. -%endif %prep # The publisher doesn't sign the source tarball, but a signatures file containing multiple hashes. @@ -98,8 +115,10 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURCE0}" | sha256sum -c %setup -q -n cmake-%{version} %autopatch -p1 +cp %{SOURCE99} . %build +%if "%{flavor}" != "" export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" # This is not autotools configure @@ -109,9 +128,12 @@ --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ --system-libs \ +%if %{with mini} + --no-system-curl \ --no-system-jsoncpp \ --no-system-libarchive \ --no-system-zstd \ +%endif --parallel=0%{jobs} \ --verbose \ %if %{with gui} @@ -121,9 +143,11 @@ --no-qt-gui \ %endif %{nil} -make VERBOSE=1 %{?_smp_mflags} +%make_build +%endif %install +%if "%{flavor}" != "" %make_install mkdir -p %{buildroot}%{_libdir}/cmake %if %{with gui} @@ -146,20 +170,23 @@ # Install bash completion symlinks mkdir -p %{buildroot}%{_datadir}/bash-completion/completions -for f in %{buildroot}%{_datadir}/%{name}/completions/* +for f in %{buildroot}%{_datadir}/cmake/completions/* do - ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions + ln -s ../../cmake/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions done # cmake-mode.el -%define cmake_mode_el %{_datadir}/emacs/site-lisp/%{name}-mode.el +%define cmake_mode_el %{_datadir}/emacs/site-lisp/cmake-mode.el install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%cmake_mode_el -rm %{buildroot}%{_datadir}/%{name}/editors/emacs/cmake-mode.el -# fix: W: files-duplicate (%license covers already) -rm %{buildroot}%{_docdir}/%{name}/Copyright.txt +rm %{buildroot}%{_datadir}/cmake/editors/emacs/cmake-mode.el +# fix: W: files-duplicate (%%license covers already) +rm %{buildroot}%{_docdir}/cmake/Copyright.txt %fdupes %{buildroot}%{_datadir}/cmake +%endif +%endif +%if "%{flavor}" == "full" %check # Excluded tests: # TestUpload: uses internet connection @@ -174,7 +201,7 @@ %files -n cmake-gui %license Copyright.txt %{_bindir}/cmake-gui -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/cmake-gui.desktop %{_datadir}/mime/packages/cmakecache.xml %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/* @@ -188,9 +215,12 @@ %{_mandir}/man1/* %else %files +%if "%{flavor}" == "" +%doc README.SUSE +%else %license Copyright.txt %doc README.rst -%config %{_rpmconfigdir}/macros.d/macros.cmake +%{_rpmconfigdir}/macros.d/macros.cmake %{_libexecdir}/rpm %{_bindir}/cpack %{_bindir}/cmake @@ -200,10 +230,11 @@ %{_libdir}/cmake %dir %{_datadir}/aclocal %{_datadir}/aclocal/cmake.m4 -%doc %{_docdir}/%{name} +%doc %{_docdir}/cmake %{_datadir}/bash-completion %cmake_mode_el %dir %{dirname:%cmake_mode_el} %endif +%endif %changelog ++++++ README.SUSE ++++++ The package 'cmake' only ships a README.SUSE file and serves as a meta-package. cmake requires cmake-implementation, which inside OBS is provided by * cmake-mini (minimal cmake variant, no especially no libcurl/libarchive) * cmake-full (what used to be called cmake before) This complex setup was done in order to be able to eliminate build cycles, as more and more tools were moving to cmake as build system, but with curl in the build chain, was making it increasingly difficult to break the cycle. cmake-mini is not meant for installation on end-user systems (where it also would not save a lot; as an end user, you have libcurl on your system anyway due to libzypp) and is thus not part of the FTP Tree. ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.3c8S8G/_old 2020-03-20 05:52:48.788059755 +0100 +++ /var/tmp/diff_new_pack.3c8S8G/_new 2020-03-20 05:52:48.788059755 +0100 @@ -1,14 +1,7 @@ <constraints> - <overwrite> - <conditions> - <arch>aarch64</arch> - <arch>ppc64</arch> - <arch>ppc64le</arch> - </conditions> - <hardware> - <disk> - <size unit="G">6</size> - </disk> - </hardware> - </overwrite> + <hardware> + <disk> + <size unit="G">7</size> + </disk> + </hardware> </constraints> ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.3c8S8G/_old 2020-03-20 05:52:48.800059763 +0100 +++ /var/tmp/diff_new_pack.3c8S8G/_new 2020-03-20 05:52:48.800059763 +0100 @@ -1,3 +1,5 @@ <multibuild> - <package>gui</package> + <flavor>mini</flavor> + <flavor>full</flavor> + <flavor>gui</flavor> </multibuild> ++++++ cmake-3.15.5-SHA-256.txt -> cmake-3.16.2-SHA-256.txt ++++++ --- /work/SRC/openSUSE:Leap:15.2/cmake/cmake-3.15.5-SHA-256.txt 2020-01-30 14:46:46.786786923 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.cmake.new.3160/cmake-3.16.2-SHA-256.txt 2020-03-20 05:52:47.924059179 +0100 @@ -1,11 +1,10 @@ -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 +fbf7b6341b097828cf9d3a5a29e9b9279dda8688be4e2bc497ccba472f820d8b cmake-3.16.2-Darwin-x86_64.dmg +9612a522f800674b99a816352340f7e07195c96c7d59cee9cd0057269fc439ea cmake-3.16.2-Darwin-x86_64.tar.gz +0d3e583855322d14002ab7896841af051e221a853d98fd5124dc84fa2f9dcdb6 cmake-3.16.2-Linux-x86_64.sh +0641046b4c35ac5119cd2f24f16246bfb242b47c89cbad19a9162ccbfb247d47 cmake-3.16.2-Linux-x86_64.tar.gz +1563919b09a8794a40032619fb6a0b0ddbd3ba74c2125053983061b951f71c00 cmake-3.16.2-win32-x86.msi +2e9b90dc913a2c49cda19fc09192f09460ce525316a9644251e0c5a0785920d6 cmake-3.16.2-win32-x86.zip +52c230d229eac9e509321d4d43172af5e9303ecac3cc34a97d9da6094a7c1e7e cmake-3.16.2-win64-x64.msi +c92f581bfd94718fd0bd18565206e795f2d4eb0347ba41504dfa9447bc1225c4 cmake-3.16.2-win64-x64.zip +8c09786ec60ca2be354c29829072c38113de9184f29928eb9da8446a5f2ce6a9 cmake-3.16.2.tar.gz +be25c4eb5e7fad504d555ac5ff0413ed9b46770bcb1b6da577a068ebd5a59dc8 cmake-3.16.2.zip ++++++ cmake-3.15.5.tar.gz -> cmake-3.16.2.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/cmake/cmake-3.15.5.tar.gz /work/SRC/openSUSE:Leap:15.2/.cmake.new.3160/cmake-3.16.2.tar.gz differ: char 5, line 1 ++++++ cmake.macros ++++++ --- /var/tmp/diff_new_pack.3c8S8G/_old 2020-03-20 05:52:48.864059806 +0100 +++ /var/tmp/diff_new_pack.3c8S8G/_new 2020-03-20 05:52:48.864059806 +0100 @@ -34,7 +34,6 @@ %if "%{?_lib}" == "lib64" \ -DLIB_SUFFIX=64 \\\ %endif \ - -DCMAKE_SKIP_RPATH:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_STATIC_LIBS:BOOL=OFF \\\
