From c524f94d30a55b5f9575e19cc8839eab69e0f161007e6d457b3283c0f647e77c Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 28 Oct 2019 07:01:26 +0000 Subject: [PATCH 1/8] Accepting request 743389 from home:simotek:branches:devel:tools:building MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 | 11 ----------- cmake-3.15.3-SHA-256.txt.asc | 16 ---------------- cmake-3.15.3.tar.gz | 3 --- cmake-3.15.4-SHA-256.txt | 11 +++++++++++ cmake-3.15.4-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.15.4.tar.gz | 3 +++ cmake.changes | 12 ++++++++++++ cmake.spec | 28 ++++++++++++++-------------- 8 files changed, 56 insertions(+), 44 deletions(-) delete mode 100644 cmake-3.15.3-SHA-256.txt delete mode 100644 cmake-3.15.3-SHA-256.txt.asc delete mode 100644 cmake-3.15.3.tar.gz create mode 100644 cmake-3.15.4-SHA-256.txt create mode 100644 cmake-3.15.4-SHA-256.txt.asc create mode 100644 cmake-3.15.4.tar.gz diff --git a/cmake-3.15.3-SHA-256.txt b/cmake-3.15.3-SHA-256.txt deleted file mode 100644 index 428e739..0000000 --- a/cmake-3.15.3-SHA-256.txt +++ /dev/null @@ -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 diff --git a/cmake-3.15.3-SHA-256.txt.asc b/cmake-3.15.3-SHA-256.txt.asc deleted file mode 100644 index 302eec7..0000000 --- a/cmake-3.15.3-SHA-256.txt.asc +++ /dev/null @@ -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----- diff --git a/cmake-3.15.3.tar.gz b/cmake-3.15.3.tar.gz deleted file mode 100644 index e735700..0000000 --- a/cmake-3.15.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13958243a01365b05652fa01b21d40fa834f70a9e30efa69c02604e64f58b8f5 -size 9270184 diff --git a/cmake-3.15.4-SHA-256.txt b/cmake-3.15.4-SHA-256.txt new file mode 100644 index 0000000..65c8b3b --- /dev/null +++ b/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 diff --git a/cmake-3.15.4-SHA-256.txt.asc b/cmake-3.15.4-SHA-256.txt.asc new file mode 100644 index 0000000..02e7259 --- /dev/null +++ b/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----- diff --git a/cmake-3.15.4.tar.gz b/cmake-3.15.4.tar.gz new file mode 100644 index 0000000..2ecc989 --- /dev/null +++ b/cmake-3.15.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a +size 9270648 diff --git a/cmake.changes b/cmake.changes index abff4b4..afe5a0e 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Oct 27 23:24:39 UTC 2019 - Simon Lees + +- 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 diff --git a/cmake.spec b/cmake.spec index 85f72ce..dbad3fe 100644 --- a/cmake.spec +++ b/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: libbz2-devel -BuildRequires: libcurl-mini-devel -BuildRequires: libexpat-devel -BuildRequires: libuv-devel >= 1.10 -BuildRequires: ncurses-devel +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(libarchive) >= 3.0.2 +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libuv) >= 1.10 +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 From aeaf863046f1987e955aa3246e3e1b53c21106cb597c8a9d1858f10b35b11d92 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 5 Nov 2019 10:58:37 +0000 Subject: [PATCH 2/8] Accepting request 745353 from home:simotek:branches:devel:tools:building - Update cmake conditionals to make sure the multibuild is nicely leveraged OBS-URL: https://build.opensuse.org/request/show/745353 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=380 --- cmake.changes | 6 +++ cmake.spec | 64 ++++++++++++++------------- feature-suse-cmake-gui-drop-qt4.patch | 13 ++++++ 3 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 feature-suse-cmake-gui-drop-qt4.patch diff --git a/cmake.changes b/cmake.changes index afe5a0e..74dfd13 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 1 08:02:01 UTC 2019 - Tomáš Chvátal + +- Update cmake conditionals to make sure the multibuild is + nicely leveraged + ------------------------------------------------------------------- Sun Oct 27 23:24:39 UTC 2019 - Simon Lees diff --git a/cmake.spec b/cmake.spec index dbad3fe..ebeea8f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -16,21 +16,24 @@ # -%define flavor @BUILD_FLAVOR@%{nil} -%define shortversion 3.15 +%global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "gui" -Name: cmake-%{flavor} -Summary: CMake graphical user interface -License: BSD-3-Clause -Group: Development/Tools/Building +%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 +%define shortversion 3.15 +Name: cmake%{psuffix} Version: 3.15.4 Release: 0 +%if %{with gui} +Summary: CMake graphical user interface +%else +Summary: Cross-platform make system +%endif +License: BSD-3-Clause URL: https://www.cmake.org/ Source0: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz Source1: cmake.macros @@ -45,24 +48,25 @@ Patch2: cmake-fix-ruby-test.patch Patch4: 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 +Patch8: feature-suse-cmake-gui-drop-qt4.patch BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(expat) -BuildRequires: pkgconfig(libarchive) >= 3.0.2 -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libuv) >= 1.10 -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: pkgconfig(bzip2) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(libarchive) >= 3.0.2 +BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libuv) >= 1.10 +BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(zlib) Requires: make -%if "{%flavor}" == "gui" +%if %{with gui} BuildRequires: python-sphinx BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Widgets) @@ -72,17 +76,17 @@ 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" -%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 @@ export CXXFLAGS="%{optflags}" --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 @@ rm %{buildroot}%{_docdir}/%{name}/Copyright.txt -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 diff --git a/feature-suse-cmake-gui-drop-qt4.patch b/feature-suse-cmake-gui-drop-qt4.patch new file mode 100644 index 0000000..b2aa37c --- /dev/null +++ b/feature-suse-cmake-gui-drop-qt4.patch @@ -0,0 +1,13 @@ +Index: cmake-3.15.4/Source/QtDialog/CMakeLists.txt +=================================================================== +--- cmake-3.15.4.orig/Source/QtDialog/CMakeLists.txt ++++ cmake-3.15.4/Source/QtDialog/CMakeLists.txt +@@ -3,7 +3,7 @@ + + project(QtDialog) + CMake_OPTIONAL_COMPONENT(cmake-gui) +-find_package(Qt5Widgets QUIET) ++find_package(Qt5Widgets) + if (Qt5Widgets_FOUND) + include_directories(${Qt5Widgets_INCLUDE_DIRS}) + add_definitions(${Qt5Widgets_DEFINITONS}) From 7621e419e87e4b2adcfd9288ec1be652f3a2aae2a5d569ce1458bb99767454f1 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Tue, 5 Nov 2019 20:58:06 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=381 --- feature-suse-cmake-gui-drop-qt4.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 feature-suse-cmake-gui-drop-qt4.patch diff --git a/feature-suse-cmake-gui-drop-qt4.patch b/feature-suse-cmake-gui-drop-qt4.patch deleted file mode 100644 index b2aa37c..0000000 --- a/feature-suse-cmake-gui-drop-qt4.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: cmake-3.15.4/Source/QtDialog/CMakeLists.txt -=================================================================== ---- cmake-3.15.4.orig/Source/QtDialog/CMakeLists.txt -+++ cmake-3.15.4/Source/QtDialog/CMakeLists.txt -@@ -3,7 +3,7 @@ - - project(QtDialog) - CMake_OPTIONAL_COMPONENT(cmake-gui) --find_package(Qt5Widgets QUIET) -+find_package(Qt5Widgets) - if (Qt5Widgets_FOUND) - include_directories(${Qt5Widgets_INCLUDE_DIRS}) - add_definitions(${Qt5Widgets_DEFINITONS}) From c3df1052bed6e54cdc8135bdeb16a3e848b77858cccdd0f4b3b7bc264ecd40ef Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Tue, 5 Nov 2019 20:59:36 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=382 --- cmake.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index ebeea8f..1a353f1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -43,12 +43,11 @@ Source4: cmake.prov 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 -Patch8: feature-suse-cmake-gui-drop-qt4.patch +Patch3: feature-suse-python-interp-search-order.patch BuildRequires: fdupes BuildRequires: gcc-c++ # this is commented as it would create dependancy cycle between jsoncpp and cmake From bcf63726cc207df560eff06d329d3811a1e0f9bacf2fa92c66c5cfaaba61feaa Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Tue, 5 Nov 2019 21:00:38 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=383 --- cmake.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake.changes b/cmake.changes index 74dfd13..834712f 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 5 20:59:38 UTC 2019 - Simon Lees + +- Drop debug patch (never in factory) and update patch numbers + ------------------------------------------------------------------- Fri Nov 1 08:02:01 UTC 2019 - Tomáš Chvátal From 2a375164bbb51a0cf2965bcab8463be294a7c545f73b9bc76e7611d86042fc65 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Fri, 8 Nov 2019 22:42:01 +0000 Subject: [PATCH 6/8] Accepting request 746617 from home:fcrozat:branches:devel:tools:building (add bug numbers from SLE15 changelog, to allow cmake update in 15SP2) - Allow %cmake_build to handle parameters (bsc#1091864) warning for now (bsc#1129024) - update to 3.12.4 (bsc#1127105): OBS-URL: https://build.opensuse.org/request/show/746617 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=384 --- cmake.changes | 6 +++--- cmake.spec | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake.changes b/cmake.changes index 834712f..17b1b3e 100644 --- a/cmake.changes +++ b/cmake.changes @@ -171,7 +171,7 @@ Fri Mar 15 05:20:57 UTC 2019 - Christoph G ------------------------------------------------------------------- Thu Mar 14 00:52:40 UTC 2019 - Simon Lees -- Allow %cmake_build to handle parameters +- Allow %cmake_build to handle parameters (bsc#1091864) ------------------------------------------------------------------- Mon Feb 25 13:53:26 UTC 2019 - Dan Čermák @@ -213,7 +213,7 @@ Tue Jan 29 09:57:18 UTC 2019 - Tomáš Chvátal - Rename %make_jobs to %cmake_build to inline with other lang macros like meson, also since we are not just using make it is less confusing this way. Keep the %make_jobs as compat wrapper with - warning for now + warning for now (bsc#1129024) ------------------------------------------------------------------- Tue Jan 15 01:57:19 UTC 2019 - seanlew@opensuse.org @@ -264,7 +264,7 @@ Thu Nov 22 04:33:14 UTC 2018 - sean@suspend.net ------------------------------------------------------------------- Fri Nov 09 14:59:33 UTC 2018 - sean@suspend.net -- update to 3.12.4: +- update to 3.12.4 (bsc#1127105): * Cmake(1) build tool (cmake--build) gained --parallel [] and -j [] options to specify a parallel build level. * add_compile_definitions() command was added to set preprocessor diff --git a/cmake.spec b/cmake.spec index 1a353f1..cef71b3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -30,10 +30,11 @@ Version: 3.15.4 Release: 0 %if %{with gui} Summary: CMake graphical user interface +License: BSD-3-Clause %else Summary: Cross-platform make system -%endif License: BSD-3-Clause +%endif URL: https://www.cmake.org/ Source0: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz Source1: cmake.macros From 9749d1911df96457bd4dd1f6c9096f282cbb6f490c685843fdd1e1ea7a14c014 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sun, 10 Nov 2019 17:02:30 +0000 Subject: [PATCH 7/8] Accepting request 747162 from home:AndreasStieger:branches:devel:tools:building cmake 3.15.5 OBS-URL: https://build.opensuse.org/request/show/747162 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=385 --- cmake-3.15.4-SHA-256.txt | 11 ----------- cmake-3.15.4-SHA-256.txt.asc | 16 ---------------- cmake-3.15.4.tar.gz | 3 --- cmake-3.15.5-SHA-256.txt | 11 +++++++++++ cmake-3.15.5-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.15.5.tar.gz | 3 +++ cmake.changes | 6 ++++++ cmake.spec | 2 +- 8 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 cmake-3.15.4-SHA-256.txt delete mode 100644 cmake-3.15.4-SHA-256.txt.asc delete mode 100644 cmake-3.15.4.tar.gz create mode 100644 cmake-3.15.5-SHA-256.txt create mode 100644 cmake-3.15.5-SHA-256.txt.asc create mode 100644 cmake-3.15.5.tar.gz diff --git a/cmake-3.15.4-SHA-256.txt b/cmake-3.15.4-SHA-256.txt deleted file mode 100644 index 65c8b3b..0000000 --- a/cmake-3.15.4-SHA-256.txt +++ /dev/null @@ -1,11 +0,0 @@ -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 diff --git a/cmake-3.15.4-SHA-256.txt.asc b/cmake-3.15.4-SHA-256.txt.asc deleted file mode 100644 index 02e7259..0000000 --- a/cmake-3.15.4-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------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----- diff --git a/cmake-3.15.4.tar.gz b/cmake-3.15.4.tar.gz deleted file mode 100644 index 2ecc989..0000000 --- a/cmake-3.15.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a -size 9270648 diff --git a/cmake-3.15.5-SHA-256.txt b/cmake-3.15.5-SHA-256.txt new file mode 100644 index 0000000..d7422b1 --- /dev/null +++ b/cmake-3.15.5-SHA-256.txt @@ -0,0 +1,11 @@ +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 diff --git a/cmake-3.15.5-SHA-256.txt.asc b/cmake-3.15.5-SHA-256.txt.asc new file mode 100644 index 0000000..ea1e91b --- /dev/null +++ b/cmake-3.15.5-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl25olMACgkQLSzvEDSS +FoTLYg//dFliQ0z1Ew/7b2drET+3tuKN5+eEl+JT0wrzF67RVgxhMnI6McqiDeIk +3lSw7ZPsFVVqXaP8WPD3Z10F2KtYRDLU/rLZbX8NSEFo/QyRsJyNnSTCb/zVofbX +FEOBQoTIpaX3KuR/70fRYghwn1iKf/Ld1wgFQjtLRME3zu0SglZlaZCuhGZi0CK4 +NY/zKEYDIInXy7LLFcRdo2sittn7hjewM8ys2SC3wgfWDwpCr4DHfVLjYgdc4iTj +Eh5xLEusHMkRrZBEzUSz+vPpHfre+aMYsYSDuOOxgPac7Z5+kbdIDcd2x/7qZ6ad +BMFw56k6hAXPQ91EEKHYxvWZf55eeS56Huw9fx/voc+XnM/G+xERgaSIdN277iOU +8JymHxYk3EtlG5CzBnPSa2e9WHCt783UP2DXhtuzg0GOHhLniutF1BXYSIFx08du +cDZL3gQR96a2ZJ/JMkZVarDWJ2InRUBpgQEWDYtlPzq9BvXq+1ugb/SxMprRgttV ++7yfrYbsW8e2thgGLVtB0rZK+fuccdZN9yiivIErMH7VAqWRxK36cf4cPC7wZU9f +AE7tVPJ6SAp4h+t/J6ONe6fMSv/v3FUhtMh5+YDmS4lLrBhII5KnGy/wiTyCGOKb +D9+xb+oW6T2xw/H9aSQeV/SmQGbwSEFPoC/F6CkZTh8jPSxenic= +=wT5l +-----END PGP SIGNATURE----- diff --git a/cmake-3.15.5.tar.gz b/cmake-3.15.5.tar.gz new file mode 100644 index 0000000..875ca1e --- /dev/null +++ b/cmake-3.15.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4 +size 9271925 diff --git a/cmake.changes b/cmake.changes index 17b1b3e..106516d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 10 09:07:55 UTC 2019 - Andreas Stieger + +- cmake 3.15.5: + * no changelog available + ------------------------------------------------------------------- Tue Nov 5 20:59:38 UTC 2019 - Simon Lees diff --git a/cmake.spec b/cmake.spec index cef71b3..25b9929 100644 --- a/cmake.spec +++ b/cmake.spec @@ -26,7 +26,7 @@ %endif %define shortversion 3.15 Name: cmake%{psuffix} -Version: 3.15.4 +Version: 3.15.5 Release: 0 %if %{with gui} Summary: CMake graphical user interface From 5f72f4617ae3457db15d63fbdd86d49f93920ecbf8078cf6734b8f716961800f Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 13 Nov 2019 13:48:28 +0000 Subject: [PATCH 8/8] - Switch back to libcurl-mini-devel to avoid new build cycle OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=386 --- cmake.changes | 5 +++++ cmake.spec | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cmake.changes b/cmake.changes index 106516d..6879d0d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 13 13:48:07 UTC 2019 - Martin Pluskal + +- Switch back to libcurl-mini-devel to avoid new build cycle + ------------------------------------------------------------------- Sun Nov 10 09:07:55 UTC 2019 - Andreas Stieger diff --git a/cmake.spec b/cmake.spec index 25b9929..7530559 100644 --- a/cmake.spec +++ b/cmake.spec @@ -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 @@ -28,13 +28,6 @@ Name: cmake%{psuffix} Version: 3.15.5 Release: 0 -%if %{with gui} -Summary: CMake graphical user interface -License: BSD-3-Clause -%else -Summary: Cross-platform make system -License: BSD-3-Clause -%endif URL: https://www.cmake.org/ Source0: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz Source1: cmake.macros @@ -51,6 +44,7 @@ Patch2: form.patch Patch3: 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) @@ -60,13 +54,19 @@ BuildRequires: rhash-devel BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libarchive) >= 3.0.2 -BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libuv) >= 1.10 BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(zlib) Requires: make %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)