Accepting request 743389 from home:simotek:branches:devel:tools:building

- 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)

OBS-URL: https://build.opensuse.org/request/show/743389
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=379

cmake-3.15.3-SHA-256.txt

@@ -1,11 +0,0 @@
-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

cmake-3.15.3-SHA-256.txt.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl1v0JYACgkQLSzvEDSS
-FoT17w//cyiYAc2HvrPt6j2GgTwBNrcXZX9o9RllvDAbke5/4JZ2PQeY9MLXLus7
-PtawiNRhgh1V1yV0LmdbMUKNpOWYh74VCsuoj+NVD8JBSygcgsqTgLisyXwYER4E
-AEp2SgrvZRjddq3NtB23++9HmOOxXNRaftK1ST02vcJ25S4ONhqbdjAJTTEVJhXh
-qcJXyzAO5znkJ9ZamI0WxJGiCfyVZRl+XEqG4vMDv3ZRDIt+Zd/dpyOVAfsaY4Kc
-46+TDch+Q1Ymzbqq1+XyRdu/74mz86pKxovNDaNw6edmKydZzaeFfyqUtc9jrK+C
-X9qDAhVOcwbHgdyPYmuVxLDBQPBm0ePP3RKiaT6GCkP4ToxhFwYK4GufdcwYjD+4
-hOYgV0wf4nAhBRCUf9CzPP8kcv5oAQJeUY2I1YcRN/BvlQwXKBeC6goqidN0z0X2
-aASutDHUrHUDRUnWX7LxfglAyb9mGONnEcp19euEmGk3LM3VmeK2jP0QFz6++xuP
-wOejdcDWFKnL/1dJlzvfAYPt0svc3Ux+J3T27QXYyPHVs3CSeKLOcn1Zos7Qq28y
-AApCMzUIQWjLYdEF7g/sq2v6xRM3Ekqtc9THrUye82vS+bZ4hoLLTOq2Xb4Ihdp0
-gooAuuGbVSZoC0Ni331evNtNvP6MuGOJKzaouUIsflZyQ5muSGs=
-=Y+nX
------END PGP SIGNATURE-----

cmake-3.15.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13958243a01365b05652fa01b21d40fa834f70a9e30efa69c02604e64f58b8f5
-size 9270184

cmake-3.15.4-SHA-256.txt

@@ -0,0 +1,11 @@
+2e6487178b474722209d97746466b87ebd90a4702dd2d4b2924cce4ed2863024  cmake-3.15.4-Darwin-x86_64.dmg
+adfbf611d21daa83b9bf6d85ab06a455e481b63a38d6e1270d563b03d4e5f829  cmake-3.15.4-Darwin-x86_64.tar.gz
+b6fc7007da66ca131c2da9b93177d6abc842068e4155c8f1491276457fa6e83e  cmake-3.15.4-Linux-x86_64.sh
+7c2b17a9be605f523d71b99cc2e5b55b009d82cf9577efb50d4b23056dee1109  cmake-3.15.4-Linux-x86_64.tar.gz
+b1d33994feed479d2f0ec27ef10268a382267113bade7e02a10d8faa98979d8b  cmake-3.15.4-win32-x86.msi
+19c2bfd26c4de4d8046dd5ad6de95b57a2556559ec81b13b94e63ea4ae49b3f2  cmake-3.15.4-win32-x86.zip
+9971f2033b350e7603d4ccafe3b8e11bceb12c4add52e0fd769c13b29d2632b6  cmake-3.15.4-win64-x64.msi
+5bb49c0274800c38833e515a01af75a7341db68ea82c71856bb3cf171d2068be  cmake-3.15.4-win64-x64.zip
+115f8d20d10517cb8c40657f9b6c1af04dd9dce34760d74370f71223f9e43ec8  cmake-3.15.4.tar.Z
+8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a  cmake-3.15.4.tar.gz
+93ae3c35ac4ffecea0a62f6dbe6a6091f0cc5591c3d9f5fc7153746b4b82d371  cmake-3.15.4.zip

cmake-3.15.4-SHA-256.txt.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl2SZ1kACgkQLSzvEDSS
+FoRODw//W+k342Ul1ofPpmmWkJdhajbxOwr/o8A/zNwhMTA2IkPdznadMzhabXDl
+hDh9vPaQVpWvdXEZmqmO9hIo/AaDH3d1ALOfsej1bDHyv8JGsZvQ1kohP/4iS/S7
+fClha+SjDqMH+DVvRmWao38NJIY4tOV0WGB7muGKiiHKcDo4c8Ow6R5AE0W0o/pR
+sGzaqAMjUVJEf6BJlKQhSiIqpdfpj+RnbKG+V4eX3ZH5ezfmfkXru9dCrp2ObgbK
+FUn/3VrswlK8tMdNOm4XFDUFcd24gooNf8h9Xs+YbfOQwbx/qCT3OxlYCSxFjRZh
+zxW1RfbIFkZoKCgEbdMZ423cF4H+Bpef51GpB5p4CDgBUt4sVAu2P8rxT++nC5Gg
+yfjRCfEaf5ZYc/bIQr/SogHsjxgyVZ16vsVsBKUoUMSH3Cxk5FeMGTIevXCNim0g
+VqJOCKy/24msVs9lOcUjeC9JQ0lFmsELWDx5iErv0Kslxxoy9WuYLznk42LMxQ0K
+1rG936WIJg4IcTtN/OUYPjL39qup8uj+un2/A3HFumzSRp7CbyJP0+mhSd6DXZBD
+oGSSnHA4kpOMvCSTLSJEUyUQ1YEPiDHTW5ECdTkuv5u9IM/5Gp2+/0av9DdNOuRA
+HQXlEG8HkONJ0Qa7etB9jrsWXnzOi38IhdSfOKzp/43yszg2UXI=
+=mF/m
+-----END PGP SIGNATURE-----

cmake-3.15.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a
+size 9270648

cmake.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Oct 27 23:24:39 UTC 2019 - Simon Lees <sflees@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)
+
 -------------------------------------------------------------------
 Wed Sep  4 20:52:50 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
 

cmake.spec

@@ -18,7 +18,7 @@
 
 %define flavor @BUILD_FLAVOR@%{nil}
 %define shortversion 3.15
-%if "%flavor" == "gui"
+%if "%{flavor}" == "gui"
 Name:           cmake-%{flavor}
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
@@ -29,7 +29,7 @@ Summary:        Cross-platform make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
 %endif
-Version:        3.15.3
+Version:        3.15.4
 Release:        0
 URL:            https://www.cmake.org/
 Source0:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz
@@ -47,22 +47,22 @@ Patch4:         form.patch
 Patch7:         feature-suse-python-interp-search-order.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  libarchive-devel >= 3.0.2
+BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  libbz2-devel
+BuildRequires:  pkgconfig(expat)
-BuildRequires:  libcurl-mini-devel
+BuildRequires:  pkgconfig(libarchive) >= 3.0.2
-BuildRequires:  libexpat-devel
+BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  libuv-devel >= 1.10
+BuildRequires:  pkgconfig(libuv) >= 1.10
-BuildRequires:  ncurses-devel
+BuildRequires:  pkgconfig(ncurses)
 # 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)
+BuildRequires:  pkgconfig(zlib)
 Requires:       make
-%if "%flavor" == "gui"
+%if "{%flavor}" == "gui"
 BuildRequires:  python-sphinx
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt5Widgets)
@@ -72,7 +72,7 @@ Recommends:     cmake-man
 # bnc#953842 - A python file is shipped so require python base so it can be run.
 Requires:       python3-base
 %endif
-%if "%flavor" == "gui"
+%if "%{flavor}" == "gui"
 %description
 This is a Graphical User Interface for CMake, a cross-platform
 build system.
@@ -110,7 +110,7 @@ export CXXFLAGS="%{optflags}"
     --no-system-zstd \
     --parallel=0%{jobs} \
     --verbose \
-    %if "%flavor" == "gui"
+    %if "%{flavor}" == "gui"
     --qt-gui \
     --sphinx-man \
     %else
@@ -122,7 +122,7 @@ make VERBOSE=1 %{?_smp_mflags}
 %install
 %make_install
 mkdir -p %{buildroot}%{_libdir}/cmake
-%if "%flavor" == "gui"
+%if "%{flavor}" == "gui"
 %suse_update_desktop_file  -r %{name} CMake Development IDE Tools Qt
 
 # delete files that belong to the 'cmake' package
@@ -166,7 +166,7 @@ rm %{buildroot}%{_docdir}/%{name}/Copyright.txt
     -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne)|CPack_RPM)"
 %endif
 
-%if "%flavor" == "gui"
+%if "%{flavor}" == "gui"
 %files
 %license Copyright.txt
 %{_bindir}/cmake-gui