Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2019-08-27 10:12:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Tue Aug 27 10:12:14 2019 rev:163 rq:723206 version:3.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2019-07-15 22:43:50.903904675 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new.7948/cmake.changes 2019-08-27 10:12:27.279975259 +0200 @@ -1,0 +2,46 @@ +Tue Aug 13 12:43:58 UTC 2019 - Martin Pluskal <mplus...@suse.com> + +- Switch to multibuild + +------------------------------------------------------------------- +Mon Jul 29 08:45:58 UTC 2019 - Simon Lees <sfl...@suse.de> + +- Actually remove system-libs.patch + +------------------------------------------------------------------- +Sun Jul 28 20:23:25 UTC 2019 - Christoph G <f...@grueninger.de> + +- update to 3.15.1 + * Makefile: Fix regression in dependencies on relative includes + * FindMPI: Updated to use INTERFACE_LINK_OPTIONS + * ChangeLog: https://cmake.org/cmake/help/v3.15/release/3.15.html#id1 +- drop system-libs.patch because bundled jsonpp can be selected without + this patch and form lib is no longer selected + +------------------------------------------------------------------- +Sat Jul 20 22:19:59 UTC 2019 - Christoph G <f...@grueninger.de> + +- update to 3.15.0 + * The “$<COMPILE_LANG_AND_ID:…>” generator expression was + introduced to allow specification of compile options for target + files based on the “CMAKE__COMPILER_ID” and “LANGUAGE” of each + source file. + * The “generator expressions” “C_COMPILER_ID”, “CXX_COMPILER_ID”, + “CUDA_COMPILER_ID”, “Fortran_COMPILER_ID”, “COMPILE_LANGUAGE”, + “COMPILE_LANG_AND_ID”, and “PLATFORM_ID” learned to support + matching one value from a comma-separated list. + * The “CMAKE_FIND_PACKAGE_PREFER_CONFIG” variable was added to tell + “find_package()” calls to look for a package configuration file + first even if a find module is available. + * The “PUBLIC_HEADER” and “PRIVATE_HEADER” properties may now be set + on Interface Libraries. The headers specified by those properties + can be installed using the “install(TARGETS)” command by passing + the "PUBLIC_HEADER” and “PRIVATE_HEADER” arguments respectively. + * The “FindBoost” module was reworked to expose a more consistent + user experience between its “Config” and “Module” modes and with + other find modules in general. + * The “message()” command learned new types: “NOTICE”, “VERBOSE”, + “DEBUG” and “TRACE”. +- adjust cmake-fix-ruby-test.patch and system-libs.patch + +------------------------------------------------------------------- Old: ---- cmake-3.14.5-SHA-256.txt cmake-3.14.5-SHA-256.txt.asc cmake-3.14.5.tar.gz cmake-gui.changes cmake-gui.spec system-libs.patch New: ---- _multibuild cmake-3.15.1-SHA-256.txt cmake-3.15.1-SHA-256.txt.asc cmake-3.15.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.23GShw/_old 2019-08-27 10:12:27.919975217 +0200 +++ /var/tmp/diff_new_pack.23GShw/_new 2019-08-27 10:12:27.923975217 +0200 @@ -16,41 +16,33 @@ # -%define shortversion 3.14 -# exclude for SLE 12 and Leap 42.x -%if 0%{?suse_version} == 1315 -%define system_libuv OFF -%else -%define system_libuv ON -BuildRequires: libuv-devel >= 1.10 -%endif -Name: cmake -Version: 3.14.5 +%define flavor @BUILD_FLAVOR@%{nil} +%define shortversion 3.15 +Version: 3.15.1 Release: 0 -Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building URL: https://www.cmake.org/ -Source0: https://www.cmake.org/files/v%{shortversion}/%{name}-%{version}.tar.gz +Source0: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz Source1: cmake.macros # bnc#947585 - Let CMake produces automatic RPM provides Source3: cmake.attr Source4: cmake.prov -Source5: https://www.cmake.org/files/v%{shortversion}/%{name}-%{version}-SHA-256.txt -Source6: https://www.cmake.org/files/v%{shortversion}/%{name}-%{version}-SHA-256.txt.asc +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 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 # 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 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel +BuildRequires: libcurl-mini-devel BuildRequires: libexpat-devel +BuildRequires: libuv-devel >= 1.10 BuildRequires: ncurses-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0 % { ? suse_version} > 1320 @@ -61,23 +53,41 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(liblzma) Requires: make -# bnc#953842 - A python file is shipped so require python base so it can be run. -Requires: python3-base +%if "%flavor" == "gui" +Name: cmake-%{flavor} +Summary: CMake graphical user interface +BuildRequires: python-sphinx +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Widgets) +Requires: cmake Recommends: cmake-man -%if 0%{?suse_version} >= 1330 -BuildRequires: libcurl-mini-devel %else -BuildRequires: libcurl-devel +Name: cmake +Summary: Cross-platform, open-source make system +# bnc#953842 - A python file is shipped so require python base so it can be run. +Requires: python3-base %endif +%if "%flavor" == "gui" +%description +This is a Graphical User Interface for CMake, a cross-platform, +open-source build system. +%package -n cmake-man +Summary: Cross-platform, open-source make system - manual pages +Group: Development/Tools/Building + +%description -n cmake-man +Manual pages for cmake, Cross-platform, open-source make system +%else %description CMake is a cross-platform, open-source build system +%endif %prep # The publisher doesn't sign the source tarball, but a signatures file containing multiple hashes. # Verify hashes in that file against source tarball. -echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURCE0}" | sha256sum -c -%setup -q +echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURCE0}" | sha256sum -c +%setup -q -n cmake-%{version} %autopatch -p1 %build @@ -86,21 +96,37 @@ # This is not autotools configure ./configure \ --prefix=%{_prefix} \ - --datadir=/share/%{name} \ - --docdir=/share/doc/packages/%{name} \ + --datadir=/share/cmake \ + --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ --system-libs \ --no-system-jsoncpp \ + --no-system-libarchive \ + --no-system-zstd \ --parallel=0%{jobs} \ --verbose \ + %if "%flavor" == "gui" + --qt-gui \ + --sphinx-man \ + %else --no-qt-gui \ - -- \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{system_libuv} + %endif + -- make VERBOSE=1 %{?_smp_mflags} %install %make_install mkdir -p %{buildroot}%{_libdir}/cmake +%if "%flavor" == "gui" +%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,ccmake} +rm -rf %{buildroot}%{_datadir}/cmake +rm -rf %{buildroot}%{_datadir}/aclocal/cmake.m4 +rm -rf %{buildroot}%{_docdir}/cmake +%else + find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644 # rpm macros install -m644 %{SOURCE1} -D %{buildroot}%{_rpmconfigdir}/macros.d/macros.cmake @@ -118,13 +144,14 @@ # cmake-mode.el %define cmake_mode_el %{_datadir}/emacs/site-lisp/%{name}-mode.el -install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{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 %fdupes %{buildroot}%{_datadir}/cmake + %check # Excluded tests: # TestUpload: uses internet connection @@ -133,7 +160,25 @@ # 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)|CPack_RPM)" +%endif +%if "%flavor" == "gui" +%files +%license Copyright.txt +%{_bindir}/cmake-gui +%{_datadir}/applications/%{name}.desktop +%{_datadir}/mime/packages/cmakecache.xml +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/* +%dir %{_datadir}/icons/hicolor/*/* +%{_datadir}/icons/hicolor/128x128/apps/CMakeSetup.png +%{_datadir}/icons/hicolor/32x32/apps/CMakeSetup.png + +%files -n cmake-man +%license Copyright.txt +%{_mandir}/man7/* +%{_mandir}/man1/* +%else %files %license Copyright.txt %doc README.rst @@ -149,7 +194,8 @@ %{_datadir}/aclocal/cmake.m4 %doc %{_docdir}/%{name} %{_datadir}/bash-completion -%{cmake_mode_el} -%dir %{dirname:%{cmake_mode_el}} +%cmake_mode_el +%dir %{dirname:%cmake_mode_el} +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>gui</package> </multibuild> ++++++ cmake-3.14.5-SHA-256.txt -> cmake-3.15.1-SHA-256.txt ++++++ --- /work/SRC/openSUSE:Factory/cmake/cmake-3.14.5-SHA-256.txt 2019-06-24 21:50:31.907974293 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new.7948/cmake-3.15.1-SHA-256.txt 2019-08-27 10:12:25.491975379 +0200 @@ -1,11 +1,11 @@ -a1dd64edb6036fdaa365ed0cd850e437ce6ab2e67da817f080376a2aa05eefc8 cmake-3.14.5-Darwin-x86_64.dmg -b0fde2bb6640653da618906764bb38b6b636df0082ed615074674a3146c18d6b cmake-3.14.5-Darwin-x86_64.tar.gz -1a6082a92be9b11d1e956a2126d0c5ee6d2fbeb70cb419d3b92527e48d6b67c2 cmake-3.14.5-Linux-x86_64.sh -757e7ddd29d11422334a60d7cd9c19b7af20349a03cb15aa3c879f1b54193c95 cmake-3.14.5-Linux-x86_64.tar.gz -93cf5fa6c3dbb0de1cbb80765bcc6c4c8da6a70a8c8cbd7191e03f2f828bf4ab cmake-3.14.5-win32-x86.msi -3fd5f0f8cc95761d5c52f44afe3c55e047704da57946ac4cdac80a4dd39ac6c7 cmake-3.14.5-win32-x86.zip -5776bc8e94e235234411ca65c2d368cdf07e7287708cce967ece8e07613fbd4d cmake-3.14.5-win64-x64.msi -897c167ca809b05d50288a0f4f47028a2f160aff2b9b509791ddd75db12e415a cmake-3.14.5-win64-x64.zip -910619bff984b731c2da41b3692c61b2ca4ad23bf85ee7377b30b6c608f2f845 cmake-3.14.5.tar.Z -505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06 cmake-3.14.5.tar.gz -30ffb17a68594c8afb576e34207debffa28a41aec9e827c4ca20c7977b042d11 cmake-3.14.5.zip +69de89c094fea5673125a48305ea73a150cacbe5ad516f14a8feaaecea64bbfc cmake-3.15.1-Darwin-x86_64.dmg +99e1161881dc136b77e0a27a6d2abcb2910e5126e173d4fa3bc017ec50f7b88b cmake-3.15.1-Darwin-x86_64.tar.gz +4a58252233fe534a8ca892e964bfffc52c1e0e1b33f1fcd121d1de6360603061 cmake-3.15.1-Linux-x86_64.sh +cdee72c5ef934c4972f1ad4e9c35712589345f3470a3cf15f7be493c170cc965 cmake-3.15.1-Linux-x86_64.tar.gz +dedc56098aa3db7a866f433b690e7e67e5b7dabf6dbe48804f54ddd54422ec2c cmake-3.15.1-win32-x86.msi +d20a8522dec26f8966b4a65557d0dcf5021e69e318e6c46b2b1d3786a578164e cmake-3.15.1-win32-x86.zip +b84ce1a5fc7ff7afe9590bcdf07ee8f8e8d5ae1e85a27dbcb1e6ccab26b441b9 cmake-3.15.1-win64-x64.msi +82a0edfed4cb0b45b25d2f99e621d3ed4014f66191d8f3c7eadf1d9ccf9c461b cmake-3.15.1-win64-x64.zip +71b0e81873111ebc680a427528622e4a4acecfce41abbc0631d13516d7605fae cmake-3.15.1.tar.Z +18dec548d8f8b04d53c60f9cedcebaa6762f8425339d1e2c889c383d3ccdd7f7 cmake-3.15.1.tar.gz +5c9d530c45b7f5e0465f09f1a4be8a8c5bcd97e3d9d01f631dba941245def414 cmake-3.15.1.zip ++++++ cmake-3.14.5.tar.gz -> cmake-3.15.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/cmake/cmake-3.14.5.tar.gz /work/SRC/openSUSE:Factory/.cmake.new.7948/cmake-3.15.1.tar.gz differ: char 5, line 1 ++++++ cmake-fix-ruby-test.patch ++++++ --- /var/tmp/diff_new_pack.23GShw/_old 2019-08-27 10:12:27.995975212 +0200 +++ /var/tmp/diff_new_pack.23GShw/_new 2019-08-27 10:12:27.995975212 +0200 @@ -2,12 +2,12 @@ =================================================================== --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake -@@ -111,7 +111,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO - _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) +@@ -111,7 +111,7 @@ + _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) - # vendor_ruby available ? -- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" -+ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?" - OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) + # vendor_ruby available ? +- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" ++ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?" + OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) - if(RUBY_HAS_VENDOR_RUBY) + if(RUBY_HAS_VENDOR_RUBY)
