Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked
in at 2019-11-18 20:00:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmake (Old)
and /work/SRC/openSUSE:Factory/.cmake.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake"
Mon Nov 18 20:00:15 2019 rev:166 rq:748304 version:3.15.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2019-09-11
10:21:01.587506049 +0200
+++ /work/SRC/openSUSE:Factory/.cmake.new.26869/cmake.changes 2019-11-18
20:00:35.445888103 +0100
@@ -1,0 +2,34 @@
+Wed Nov 13 13:48:07 UTC 2019 - Martin Pluskal <mplus...@suse.com>
+
+- Switch back to libcurl-mini-devel to avoid new build cycle
+
+-------------------------------------------------------------------
+Sun Nov 10 09:07:55 UTC 2019 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- cmake 3.15.5:
+ * no changelog available
+
+-------------------------------------------------------------------
+Tue Nov 5 20:59:38 UTC 2019 - Simon Lees <simonf.l...@suse.com>
+
+- Drop debug patch (never in factory) and update patch numbers
+
+-------------------------------------------------------------------
+Fri Nov 1 08:02:01 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Update cmake conditionals to make sure the multibuild is
+ nicely leveraged
+
+-------------------------------------------------------------------
+Sun Oct 27 23:24:39 UTC 2019 - Simon Lees <sfl...@suse.de>
+
+- cmake 3.15.4
+ * In CMake 3.15.0 through 3.15.3, the EXCLUDE_FROM_ALL directory
+ property was regressed from pre-3.14 behavior and caused targets
+ within the directory to be excluded even from its own “all”.
+ This has been fixed. The bug also existed in 3.14.0 through
+ 3.14.6 and is fixed in 3.14.7.
+- Use pkgconfig for dependencies where possible (required due to
+ tumbleweed build changes)
+
+-------------------------------------------------------------------
@@ -151 +185 @@
-- Allow %cmake_build to handle parameters
+- Allow %cmake_build to handle parameters (bsc#1091864)
@@ -193 +227 @@
- warning for now
+ warning for now (bsc#1129024)
@@ -244 +278 @@
-- update to 3.12.4:
+- update to 3.12.4 (bsc#1127105):
Old:
----
cmake-3.15.3-SHA-256.txt
cmake-3.15.3-SHA-256.txt.asc
cmake-3.15.3.tar.gz
New:
----
cmake-3.15.5-SHA-256.txt
cmake-3.15.5-SHA-256.txt.asc
cmake-3.15.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake.spec ++++++
--- /var/tmp/diff_new_pack.3S4rTn/_old 2019-11-18 20:00:37.525887060 +0100
+++ /var/tmp/diff_new_pack.3S4rTn/_new 2019-11-18 20:00:37.529887057 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cmake
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,17 @@
#
-%define flavor @BUILD_FLAVOR@%{nil}
-%define shortversion 3.15
-%if "%flavor" == "gui"
-Name: cmake-%{flavor}
-Summary: CMake graphical user interface
-License: BSD-3-Clause
-Group: Development/Tools/Building
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "gui"
+%define psuffix -gui
+%bcond_without gui
%else
-Name: cmake
-Summary: Cross-platform make system
-License: BSD-3-Clause
-Group: Development/Tools/Building
+%define psuffix %{nil}
+%bcond_with gui
%endif
-Version: 3.15.3
+%define shortversion 3.15
+Name: cmake%{psuffix}
+Version: 3.15.5
Release: 0
URL: https://www.cmake.org/
Source0:
https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz
@@ -40,29 +37,36 @@
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
+Patch1: cmake-fix-ruby-test.patch
# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the
ncurses includes
-Patch4: form.patch
+Patch2: form.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
+Patch3: 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
#BuildRequires: pkgconfig(jsoncpp)
#endif
BuildRequires: pkgconfig
BuildRequires: rhash-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(bzip2)
+BuildRequires: pkgconfig(expat)
+BuildRequires: pkgconfig(libarchive) >= 3.0.2
BuildRequires: pkgconfig(liblzma)
+BuildRequires: pkgconfig(libuv) >= 1.10
+BuildRequires: pkgconfig(ncurses)
+BuildRequires: pkgconfig(zlib)
Requires: make
-%if "%flavor" == "gui"
+%if %{with gui}
+Summary: CMake graphical user interface
+License: BSD-3-Clause
+%else
+Summary: Cross-platform make system
+License: BSD-3-Clause
+%endif
+%if %{with gui}
BuildRequires: python-sphinx
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Widgets)
@@ -72,17 +76,17 @@
# 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
-build system.
%package -n cmake-man
Summary: Manual pages for cmake, a cross-platform make system
-Group: Development/Tools/Building
%description -n cmake-man
Manual pages for cmake, a cross-platform make system.
+
+%if %{with gui}
+%description
+This is a Graphical User Interface for CMake, a cross-platform
+build system.
%else
%description
CMake is a cross-platform build system.
@@ -110,20 +114,20 @@
--no-system-zstd \
--parallel=0%{jobs} \
--verbose \
- %if "%flavor" == "gui"
+%if %{with gui}
--qt-gui \
--sphinx-man \
- %else
+%else
--no-qt-gui \
- %endif
- --
+%endif
+ %{nil}
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
+%if %{with gui}
+%suse_update_desktop_file -r cmake-gui CMake Development IDE Tools Qt
# delete files that belong to the 'cmake' package
rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest,ccmake}
@@ -166,8 +170,8 @@
-E
"(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne)|CPack_RPM)"
%endif
-%if "%flavor" == "gui"
-%files
+%if %{with gui}
+%files -n cmake-gui
%license Copyright.txt
%{_bindir}/cmake-gui
%{_datadir}/applications/%{name}.desktop
++++++ cmake-3.15.3-SHA-256.txt -> cmake-3.15.5-SHA-256.txt ++++++
--- /work/SRC/openSUSE:Factory/cmake/cmake-3.15.3-SHA-256.txt 2019-09-11
10:21:00.443506191 +0200
+++ /work/SRC/openSUSE:Factory/.cmake.new.26869/cmake-3.15.5-SHA-256.txt
2019-11-18 20:00:28.285891697 +0100
@@ -1,11 +1,11 @@
-2040f9c99b833cef4c64603cd3835e04438c392bf93fd946f180883a2e04c5bf
cmake-3.15.3-Darwin-x86_64.dmg
-f5edcf630ef6b1fb6c81ea971e043318b5d4776678701e479841fb58a9c25236
cmake-3.15.3-Darwin-x86_64.tar.gz
-b0b1c2b5afd5f9b7bc26415ff5a555f060516e9e50d99a75f88d3a74c80f8297
cmake-3.15.3-Linux-x86_64.sh
-020812a9f87293482cec51fdf44f41cc47e794de568f945a8175549d997e1760
cmake-3.15.3-Linux-x86_64.tar.gz
-7cdca51d3c4e8613f5ecbc30a14e25adf1c88ec361f223472ccbe06c747600f2
cmake-3.15.3-win32-x86.msi
-711828fa6744041ea399bbe32e18472a1894594f8b08ce1d96a9cc2d20fcbc18
cmake-3.15.3-win32-x86.zip
-e35c2d18ffb6959ad4b4963144d5928dba8c2479f9eefab3fb3fa770dcf09d73
cmake-3.15.3-win64-x64.msi
-a18d96b7839ac3294e5e9f464f0af4c8336a16cd5f95e69a90a259207d7e5177
cmake-3.15.3-win64-x64.zip
-a9fff24a2e343ecea1154f97e8741b36a447f78f4b330307721e04f83feb711a
cmake-3.15.3.tar.Z
-13958243a01365b05652fa01b21d40fa834f70a9e30efa69c02604e64f58b8f5
cmake-3.15.3.tar.gz
-0c70e4b50aba829d9283ad77af1ca58d976fcd2811cdb99687be55be427daad9
cmake-3.15.3.zip
+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
++++++ cmake-3.15.3.tar.gz -> cmake-3.15.5.tar.gz ++++++
/work/SRC/openSUSE:Factory/cmake/cmake-3.15.3.tar.gz
/work/SRC/openSUSE:Factory/.cmake.new.26869/cmake-3.15.5.tar.gz differ: char 5,
line 1
