SOURCES/cmake-findruby.patch

@@ -1,8 +1,7 @@
-Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake
+diff -Naur cmake-3.18.2.orig/Modules/FindRuby.cmake cmake-3.18.2/Modules/FindRuby.cmake
-===================================================================
+--- cmake-3.18.2.orig/Modules/FindRuby.cmake	2020-09-08 13:30:51.129086854 +0000
---- cmake-3.18.0-rc1.orig/Modules/FindRuby.cmake
++++ cmake-3.18.2/Modules/FindRuby.cmake	2020-09-10 07:10:56.679302608 +0000
-+++ cmake-3.18.0-rc1/Modules/FindRuby.cmake
+@@ -300,14 +300,8 @@
-@@ -289,14 +289,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
    _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
    _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
  
@@ -14,9 +13,8 @@ Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake
 -    _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
 -    _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
 -  endif()
-+  # vendor_ruby
++  _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+  _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
++  _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
-+  _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
  
    # save the results in the cache so we don't have to run ruby the next time again
    set(Ruby_VERSION_MAJOR    ${Ruby_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)

SOURCES/macros.cmake

@@ -7,13 +7,13 @@
 %_cmake_version @@CMAKE_VERSION@@
 %__cmake /usr/bin/cmake
 %__ctest /usr/bin/ctest
+%__cmake_in_source_build 1
 %__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.}
 
 # - Set default compile flags
 # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
 # and default to -O3 -DNDEBUG.  Strip the -O3 so we can override with *FLAGS
 # - Turn on verbose makefiles so we can see and verify compile flags
-# - Turn off stripping by default so RPM can do it separately
 # - Set default install prefixes and library install directories
 # - Turn on shared libraries by default
 %cmake \
@@ -33,7 +33,6 @@
         -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
         -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-        -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
         -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\

SPECS/cmake.spec

@@ -139,7 +139,7 @@ Provides: bundled(jsoncpp)
 BuildRequires:  jsoncpp-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires:  libarchive-devel
+BuildRequires:  libarchive-devel  >= 3.3.3
 %else
 BuildRequires:  libarchive3-devel
 %endif
@@ -536,133 +536,50 @@ popd
 * Thu Oct 26 2023 Tom Stellard <tstellar@redhat.com> - 3.26.5-1
 - Update to version 3.26.5-1
 
-* Mon Oct 23 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-9
+* Tue Jan 31 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-5
-- Fix CPack bug with pretrans scriptlet
-
-* Tue Jan 31 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-8
 - Fix test case broken by git fix for CVE-2022-39253
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.20.2-7
+* Fri Jul 09 2021 sguelton@redhat.com - 3.20.2-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fix update (rhbz#1964407)
-  Related: rhbz#1991688
 
-* Wed Jul 07 2021 sguelton@redhat.com - 3.20.2-6
+* Thu Jun 17 2021 sguelton@redhat.com - 3.20.2-3
-- Another attempt at fixing License file
+- Fix rhbz#1964392 and rhbz#1964407
 
-* Thu Jul 01 2021 sguelton@redhat.com - 3.20.2-5
+* Fri Jun 04 2021 sguelton@redhat.com - 3.20.2-2
-- libdl patch after glibc update (#1975096)
+- Minimal libarchive req
-
-* Fri Jun 25 2021 sguelton@redhat.com - 3.20.2-4
-- Fix changelog entry
-
-* Thu Jun 24 2021 sguelton@redhat.com - 3.20.2-3
-- Apply fixes similar to rhbz#1964392 and rhbz#1964407
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 3.20.2-2
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
 
 * Thu May 20 2021 sguelton@redhat.com - 3.20.2-1
-- Sync with Fedora rawhide. (#1957948)
+- Sync with Fedora rawhide. (#1957947)
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.19.7-2
+* Mon Jan 25 2021 Tom Stellard <tstellar@redhat.com> - 3.18.2-9
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Sync macros from Fedora
 
-* Mon Mar 15 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.7-1
+* Wed Oct 28 2020 sguelton@redhat.com - 3.18.2-8
-- cmake-3.19.7
+- External libarchive dependency
 
-* Thu Feb 25 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.6-2
+* Mon Sep 21 2020 sguelton@redhat.com - 3.18.2-7
-- cmake-3.19.6
+- Call update-desktop-database upon install
 
-* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.4-2
+* Sat Sep 12 2020 sguelton@redhat.com - 3.18.2-6
-- CMake warning when searching for Boost 1.75 (#1925355)
+- Declare conflict with cmake due to license files
 
-* Thu Jan 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.4-1
+* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-5
-- cmake-3.19.4
+- Declare conflict with cmake-doc due to license files
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.3-2
+* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Build on all arches
+- Restore license file location
+- Restore previous appdata name
 
-* Wed Jan 13 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.3-1
+* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-3
-- cmake-3.19.3
+- Fix bash-completion installation
+- keep license files in base location
 
-* Mon Jan 11 2021 Cristian Morales Vega <christian.morales.vega@gmail.com> - 3.19.2-1
+* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-2
-- Update to 3.19.2
+- Declare cmake vs old cmake-doc conflict
 
-* Tue Dec 15 2020 Tom Stellard <tstellar@redhat.com> - 3.18.4-4
+* Thu Sep 10 2020 sguelton@redhat.com - 3.18.2-1
-- Update BuildRequires for eln
+- Update to cmake-3.18.2
-
-* Fri Nov 20 08:32:34 EST 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.4-3
-- Ensure CMake does not strip binaries with package builds
-
-* Mon Nov 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.4-2
-- Add support for Python 3.10
-
-* Tue Oct 13 10:03:16 CEST 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.4-1
-- Update to 3.18.4
-
-* Wed Sep 30 12:49:57 CEST 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.3-1
-- Update to 3.18.3
-- Explicitly require make
-- Add patch to support FlexiBLAS
-
-* Tue Sep 29 2020 Christoph Junghans <junghans@votca.org> - 3.18.2-2
-- Make %ctest non-verbose by default
-
-* Thu Aug 20 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.2-1
-- Update to 3.18.2
-
-* Sat Aug 01 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.1-1
-- Update to 3.18.1
-
-* Wed Jul 29 2020 Orion Poplawski <orion@nwra.com> - 3.18.0-5
-- Handle arguments for ctest3 macro
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 22 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-3
-- Default to --verbose for ctest as well
-
-* Sun Jul 19 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.0-2
-- Make in-source builds behave like before
-
-* Sat Jul 18 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-1.1
-- Enable out-of-source builds by default
-
-* Thu Jul 16 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-1
-- Update to 3.18.0
-
-* Sat Jul 04 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.8.rc3
-- Update to 3.18.0-rc3
-
-* Fri Jul 03 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.0-0.7.rc2
-- Switch to implementation that is backwards compatible to older RPM
-- Change control macro for in-source/out-of-source to %%__cmake_in_source_build
-
-* Fri Jul 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-0.6.rc2
-- Add out-of-source builds controlled by a macro (%%__cmake_out_of_source_build)
-
-* Wed Jul 01 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-0.5.rc2
-- Undo out-of-source-builds
-
-* Tue Jun 30 2020 Tom Callaway <spot@fedoraproject.org> - 3.18.0-0.4.rc2
-- fix FindLua to support lua 5.4
-
-* Mon Jun 29 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.3.rc2
-- Apply change: CMake to do out-of-source builds (#1852036)
-
-* Sat Jun 20 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.2.rc2
-- Update to 3.18.0-rc2
-
-* Fri Jun 12 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.1.rc1
-- Update to 3.18.0-rc1
-
-* Sat May 30 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.3-2
-- Rebuild (jsoncpp)
-
-* Fri May 29 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.3-1
-- Update to cmake-3.17.3
 
 * Tue Apr 28 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.2-1
 - Update to cmake-3.17.2