diff --git a/cmake-3.26.3.tar.gz b/cmake-3.28.3.tar.gz similarity index 56% rename from cmake-3.26.3.tar.gz rename to cmake-3.28.3.tar.gz index ceac4038c14f26fd69b464b94983af15c56ea18f..174426cf52071dd072055416a7e20cacbc2887bc 100644 Binary files a/cmake-3.26.3.tar.gz and b/cmake-3.28.3.tar.gz differ diff --git a/cmake.spec b/cmake.spec index d634e4f68e8b3607a493a96389eab567aa85ba5f..dad208c689b896ecba6da44432358bb7ffc915bb 100644 --- a/cmake.spec +++ b/cmake.spec @@ -5,7 +5,6 @@ %bcond_without gui %bcond_without ncurses %bcond_without sphinx -%bcond_without bundled_jsoncpp %bcond_without bundled_rhash %bcond_without test %bcond_without X11_test @@ -19,16 +18,16 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 26 +%global minor_version 28 Name: cmake -Version: 3.26.3 -Release: %{anolis_release}%{?dist} +Version: 3.28.3 +Release: %{anolis_release}%{?dist} Summary: Cross-platform make system -License: BSD and MIT and zlib +License: BSD-3-Clause AND MIT-open-group AND Zlib URL: http://www.cmake.org -Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{name}-%{version}.tar.gz +Source0: https://github.com/Kitware/CMake/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-init.el Source2: macros.%{name} Source3: %{name}.attr @@ -61,11 +60,7 @@ BuildRequires: %{_bindir}/sphinx-build BuildRequires: bzip2-devel BuildRequires: curl-devel BuildRequires: expat-devel -%if %{with bundled_jsoncpp} -Provides: bundled(jsoncpp) -%else -BuildRequires: jsoncpp-devel -%endif +BuildRequires: jsoncpp-devel >= 1.6.0 BuildRequires: libarchive-devel BuildRequires: libuv-devel %if %{with bundled_rhash} @@ -97,7 +92,7 @@ BuildRequires: %{name}-rpm-macros BuildRequires: make Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-rpm-macros = %{version}-%{release} +Requires: (%{name}-rpm-macros = %{version}-%{release} if rpm-build) Requires: %{name}-filesystem = %{version}-%{release} Requires: make @@ -118,7 +113,7 @@ generation, code generation, and template instantiation. Summary: Common data-files for %{name} Requires: %{name} = %{version}-%{release} Requires: %{name}-filesystem = %{version}-%{release} -Requires: %{name}-rpm-macros = %{version}-%{release} +Requires: (%{name}-rpm-macros = %{version}-%{release} if rpm-build) %if %{with emacs} Requires: emacs-filesystem%{?_emacs_version: >= %{_emacs_version}} %endif @@ -198,9 +193,6 @@ $SRCDIR/bootstrap --prefix=%{_prefix} \ %if %{with bundled_rhash} --no-system-librhash \ %endif -%if %{with bundled_jsoncpp} - --no-system-jsoncpp \ -%endif %if %{with sphinx} --sphinx-man --sphinx-html \ %else @@ -208,6 +200,7 @@ $SRCDIR/bootstrap --prefix=%{_prefix} \ %endif --%{!?with_gui:no-}qt-gui \ -- \ + -DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP:BOOL=OFF \ -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \ @@ -281,9 +274,8 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ %check pushd %{_vpath_builddir} NO_TEST="CTestTestUpload" -NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator" -NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode" -NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-IgnoreGroup" +NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode" +NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" %if %{with bootstrap} NO_TEST="$NO_TEST|curl" %endif @@ -338,6 +330,9 @@ popd %{_rpmconfigdir}/%{name}.req %changelog +* Tue Feb 06 2024 Funda Wang - 3.28.3-1 +- New version 3.28.3 + * Wed Apr 5 2023 Funda Wang - 3.26.3-1 - New version 3.26.3