Architecture specific change in rpms/cmake.git

The package rpms/cmake.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cmake.git/commit/?id=3060a641bf06f44...
https://src.fedoraproject.org/cgit/rpms/cmake.git/commit/?id=25f9bed0bbe1dbe...
https://src.fedoraproject.org/cgit/rpms/cmake.git/commit/?id=3648c4d8a2c35e3....

Change:
+%ifarch s390x
-%ifarch s390x
-%ifarch s390x

Thanks.

Full change:
============

commit 48dc69cf144b057fe246538dcbe7c8a4225f31a7
Author: Bjrn Esser 
Date:   Wed Jan 22 16:24:13 2020 +0100

Update to 3.16.3

diff --git a/cmake.spec b/cmake.spec
index 2d38556..984fdb2 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -66,7 +66,7 @@
 %global orig_name cmake

Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.2
+Version:        %{major_version}.%{minor_version}.3
 Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

@@ -489,6 +489,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Wed Jan 22 2020 Bjrn Esser  - 3.16.3-1
+- Update to 3.16.3
+
 * Wed Jan 15 2020 Bjrn Esser  - 3.16.2-1
 - Update to 3.16.2
 - Use %%_vpath_builddir for out-of-tree build
diff --git a/sources b/sources
index 6b50d84..80bfe97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.16.2.tar.gz) = b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76
+SHA512 (cmake-3.16.3.tar.gz) = ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672

commit 544f6b7bd028497245bebdf9ef391a57d75141a2
Author: Bjrn Esser 
Date:   Wed Jan 22 16:23:18 2020 +0100

Drop patches that are applied in upstream tarball

diff --git a/cmake-python39.patch b/cmake-python39.patch
deleted file mode 100644
index ec39c71..0000000
--- a/cmake-python39.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3bad618ecea6a0552490515f18934ffd05c69983 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= 
-Date: Tue, 14 Jan 2020 19:41:29 +0100
-Subject: [PATCH] FindPython: Add support for version 3.9
-
-Development versions of Python 3.9.0 are already out there.
-
-See PEP 596 -- Python 3.9 Release Schedule:
-https://www.python.org/dev/peps/pep-0596/
----
- Modules/FindPython/Support.cmake | 2 +-
- Modules/FindPythonInterp.cmake   | 2 +-
- Modules/FindPythonLibs.cmake     | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
-index 7c20512080..7483d72ad8 100644
---- a/Modules/FindPython/Support.cmake
-+++ b/Modules/FindPython/Support.cmake
-@@ -23,7 +23,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
-   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
- endif()
- if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
--  set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+  set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
-   set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- else()
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index ccc7d5b585..1e01a99cbe 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -54,7 +54,7 @@ unset(_Python_NAMES)
- 
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- 
- if(PythonInterp_FIND_VERSION)
-     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 1d62ac43ea..d3ec7beec6 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
- 
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- 
- if(PythonLibs_FIND_VERSION)
-     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
--- 
-2.24.1
-
diff --git a/cmake.spec b/cmake.spec
index 7055ac2..2d38556 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -98,9 +98,6 @@ Patch101:       %{name}-fedora-flag_release.patch
 # Add dl to CMAKE_DL_LIBS on MINGW
 # https://gitlab.kitware.com/cmake/cmake/issues/17600
 Patch102:       %{name}-mingw-dl.patch
-# FindPython: Add support for version 3.9
-# https://gitlab.kitware.com/cmake/cmake/merge_requests/4225
-Patch103:       %{name}-python39.patch

# Patch for renaming on EPEL

commit b9f551dc1f4b6025ae2da20e96e472dacf783aca
Author: Bjrn Esser 
Date:   Wed Jan 15 11:53:26 2020 +0100

Do not indent rpm conditionals in macros.cmake

diff --git a/macros.cmake b/macros.cmake
index 7f24b69..ebfebee 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -14,15 +14,15 @@
 # - Set default install prefixes and library install directories
 # - Turn on shared libraries by default
 %cmake \
-  %if 0%{?set_build_flags:1} \
+%if 0%{?set_build_flags:1} \
   %set_build_flags \
-  %else \
+%else \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
   FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
   %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-  %endif \
+%endif \
   %__cmake \\
         -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\
         -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\

commit 202d11b3d1ff7d24c12f80bf0d8f14e72881bab7
Author: Bjrn Esser 
Date:   Wed Jan 15 11:40:16 2020 +0100

Use %%set_build_flags inside macros.cmake if available

diff --git a/cmake.spec b/cmake.spec
index a2f1e34..7055ac2 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -496,6 +496,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 - Update to 3.16.2
 - Use %%_vpath_builddir for out-of-tree build
 - Use %%set_build_flags to export build flags if available
+- Use %%set_build_flags inside macros.cmake if available

* Tue Jan 14 2020 Miro Hronok  - 3.16.1-2
 - FindPython: Add support for version 3.9
diff --git a/macros.cmake b/macros.cmake
index 572d3e4..7f24b69 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -14,11 +14,15 @@
 # - Set default install prefixes and library install directories
 # - Turn on shared libraries by default
 %cmake \
+  %if 0%{?set_build_flags:1} \
+  %set_build_flags \
+  %else \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
   FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
   %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
+  %endif \
   %__cmake \\
         -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\
         -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\

commit 062da0a4bf0c85d77bbb966a75c81429d81c2308
Author: Bjrn Esser 
Date:   Wed Jan 15 11:19:50 2020 +0100

Use %%set_build_flags to export build flags if available

diff --git a/cmake.spec b/cmake.spec
index a2bba06..a2f1e34 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -270,9 +270,15 @@ tail -n +2 %{SOURCE5} >> %{name}.req

%build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-export LDFLAGS="%{?__global_ldflags}"
+%if 0%{?set_build_flags:1}
+%{set_build_flags}
+%else
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
+FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS
+FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS
+%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}
+%endif
 SRCDIR="$(/usr/bin/pwd)"
 mkdir %{_vpath_builddir}
 pushd %{_vpath_builddir}
@@ -489,6 +495,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 * Wed Jan 15 2020 Bjrn Esser  - 3.16.2-1
 - Update to 3.16.2
 - Use %%_vpath_builddir for out-of-tree build
+- Use %%set_build_flags to export build flags if available

* Tue Jan 14 2020 Miro Hronok  - 3.16.1-2
 - FindPython: Add support for version 3.9

commit f48eae3697a8936b308abc81d0b832e45dff91d7
Author: Bjrn Esser 
Date:   Wed Jan 15 11:01:04 2020 +0100

Use %%_vpath_builddir for out-of-tree build

diff --git a/cmake.spec b/cmake.spec
index 0086c8b..a2bba06 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -51,6 +51,9 @@
 # Setup _pkgdocdir if not defined already
 %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}

+# Setup _vpath_builddir if not defined already
+%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
+
 %global major_version 3
 %global minor_version 16
 # Set to RC version if building RC, else %%{nil}
@@ -270,25 +273,27 @@ tail -n +2 %{SOURCE5} >> %{name}.req
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 export LDFLAGS="%{?__global_ldflags}"
-mkdir build
-pushd build
-../bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
-             --docdir=/share/doc/%{name} --mandir=/share/man \
-             --%{?with_bootstrap:no-}system-libs \
-             --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
+SRCDIR="$(/usr/bin/pwd)"
+mkdir %{_vpath_builddir}
+pushd %{_vpath_builddir}
+$SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
+                  --docdir=/share/doc/%{name} --mandir=/share/man \
+                  --%{?with_bootstrap:no-}system-libs \
+                  --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
 %if %{with sphinx}
-             --sphinx-man --sphinx-html \
+                  --sphinx-man --sphinx-html \
 %else
-             --sphinx-build=%{_bindir}/false \
+                  --sphinx-build=%{_bindir}/false \
 %endif
-             --%{!?with_gui:no-}qt-gui \
+                  --%{!?with_gui:no-}qt-gui \
 ;
-%make_build VERBOSE=1
+popd
+%make_build -C %{_vpath_builddir} VERBOSE=1

%install
 mkdir -p %{buildroot}%{_pkgdocdir}
-%make_install -C build CMAKE_DOC_DIR=%{buildroot}%{_pkgdocdir}
+%make_install -C %{_vpath_builddir} CMAKE_DOC_DIR=%{buildroot}%{_pkgdocdir}
 find %{buildroot}%{_datadir}/%{name}/Modules -type f | xargs chmod -x
 [ -n "$(find %{buildroot}%{_datadir}/%{name}/Modules -name *.orig)" ] &&
   echo "Found .orig files in %{_datadir}/%{name}/Modules, rebase patches" &&
@@ -405,7 +410,7 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
 %if 0%{?rhel} && 0%{?rhel} <= 6
 mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled
 %endif
-pushd build
+pushd %{_vpath_builddir}
 # CTestTestUpload require internet access
 # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
 NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
@@ -483,6 +488,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 %changelog
 * Wed Jan 15 2020 Bjrn Esser  - 3.16.2-1
 - Update to 3.16.2
+- Use %%_vpath_builddir for out-of-tree build

* Tue Jan 14 2020 Miro Hronok  - 3.16.1-2
 - FindPython: Add support for version 3.9

commit c563351e5ca813a65f0291ae3bcc32835102558d
Author: Bjrn Esser 
Date:   Wed Jan 15 10:40:39 2020 +0100

Update to 3.16.2

diff --git a/cmake.spec b/cmake.spec
index 676dbc4..0086c8b 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -63,8 +63,8 @@
 %global orig_name cmake

Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.1
-Release:        2%{?relsuf}%{?dist}
+Version:        %{major_version}.%{minor_version}.2
+Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -481,6 +481,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Wed Jan 15 2020 Bjrn Esser  - 3.16.2-1
+- Update to 3.16.2
+
 * Tue Jan 14 2020 Miro Hronok  - 3.16.1-2
 - FindPython: Add support for version 3.9

diff --git a/sources b/sources
index a196fc8..6b50d84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.16.1.tar.gz) = 62a8c651b1c73648420611bed3e6911da10cc5ac9131f72ef76047cb5f6e78279dc2848044279f537d9c28bb1cfa36c53bb31d00b43fa80c83f6272a1a93f4a0
+SHA512 (cmake-3.16.2.tar.gz) = b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76

commit d22a0444ecb6da48704a494c4265a2c30306eb9f
Author: Bjrn Esser 
Date:   Wed Jan 15 11:01:58 2020 +0100

Small style fixup

diff --git a/cmake.spec b/cmake.spec
index a466bf4..676dbc4 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -307,7 +307,7 @@ mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name}
 install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}/%{name}-mode.el
 %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/%{name}/%{name}-mode.el
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
-install -p -m 0644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir}
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}
 %endif
 # RPM macros
 install -p -m0644 -D %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.%{name}

commit 8d55c35ecb54c581f2823c563d5d562aec02c2b9
Author: Miro Hronok 
Date:   Tue Jan 14 19:46:18 2020 +0100

FindPython: Add support for version 3.9

diff --git a/cmake-python39.patch b/cmake-python39.patch
new file mode 100644
index 0000000..ec39c71
--- /dev/null
+++ b/cmake-python39.patch
@@ -0,0 +1,57 @@
+From 3bad618ecea6a0552490515f18934ffd05c69983 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= 
+Date: Tue, 14 Jan 2020 19:41:29 +0100
+Subject: [PATCH] FindPython: Add support for version 3.9
+
+Development versions of Python 3.9.0 are already out there.
+
+See PEP 596 -- Python 3.9 Release Schedule:
+https://www.python.org/dev/peps/pep-0596/
+---
+ Modules/FindPython/Support.cmake | 2 +-
+ Modules/FindPythonInterp.cmake   | 2 +-
+ Modules/FindPythonLibs.cmake     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
+index 7c20512080..7483d72ad8 100644
+--- a/Modules/FindPython/Support.cmake
++++ b/Modules/FindPython/Support.cmake
+@@ -23,7 +23,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
+   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
+ endif()
+ if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
+-  set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++  set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
+   set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+ else()
+diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
+index ccc7d5b585..1e01a99cbe 100644
+--- a/Modules/FindPythonInterp.cmake
++++ b/Modules/FindPythonInterp.cmake
+@@ -54,7 +54,7 @@ unset(_Python_NAMES)
+ 
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(PythonInterp_FIND_VERSION)
+     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index 1d62ac43ea..d3ec7beec6 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
+ 
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(PythonLibs_FIND_VERSION)
+     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
+-- 
+2.24.1
+
diff --git a/cmake.spec b/cmake.spec
index c6dc685..a466bf4 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -64,7 +64,7 @@

Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.1
-Release:        1%{?relsuf}%{?dist}
+Release:        2%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -95,6 +95,10 @@ Patch101:       %{name}-fedora-flag_release.patch
 # Add dl to CMAKE_DL_LIBS on MINGW
 # https://gitlab.kitware.com/cmake/cmake/issues/17600
 Patch102:       %{name}-mingw-dl.patch
+# FindPython: Add support for version 3.9
+# https://gitlab.kitware.com/cmake/cmake/merge_requests/4225
+Patch103:       %{name}-python39.patch
+

# Patch for renaming on EPEL
 %if 0%{?name_suffix:1}
@@ -477,6 +481,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Tue Jan 14 2020 Miro Hronok  - 3.16.1-2
+- FindPython: Add support for version 3.9
+
 * Sat Dec 14 2019 Bjrn Esser  - 3.16.1-1
 - Update to 3.16.1
 - Re-enable test "kwsys.testProcess-5" on S390X

commit 25f9bed0bbe1dbe99ce8321983119bde36654c84
Author: Bjrn Esser 
Date:   Sun Dec 15 19:40:14 2019 +0100

Re-enable test "kwsys.testProcess-5" on S390X

diff --git a/cmake.spec b/cmake.spec
index e61c868..c6dc685 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -405,12 +405,6 @@ pushd build
 # CTestTestUpload require internet access
 # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
 NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
-
-# kwsys.testProcess-5 fails on S390X
-%ifarch s390x
-NO_TEST="$NO_TEST|kwsys.testProcess-5"
-%endif
-
 bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
 # Keep an eye on failing tests
 bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
@@ -485,6 +479,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 %changelog
 * Sat Dec 14 2019 Bjrn Esser  - 3.16.1-1
 - Update to 3.16.1
+- Re-enable test "kwsys.testProcess-5" on S390X

* Tue Nov 26 2019 Bjrn Esser  - 3.16.0-1
 - Update to 3.16.0

commit 6158d7b92a4209a5d00b21df64ee98484e545739
Author: Bjrn Esser 
Date:   Sat Dec 14 20:50:37 2019 +0100

Update to 3.16.1

diff --git a/cmake.spec b/cmake.spec
index eb1b3d4..e61c868 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -63,7 +63,7 @@
 %global orig_name cmake

Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.0
+Version:        %{major_version}.%{minor_version}.1
 Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

@@ -483,6 +483,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Sat Dec 14 2019 Bjrn Esser  - 3.16.1-1
+- Update to 3.16.1
+
 * Tue Nov 26 2019 Bjrn Esser  - 3.16.0-1
 - Update to 3.16.0
 - Exclude test "kwsys.testProcess-5" on S390X
diff --git a/sources b/sources
index af8496f..a196fc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.16.0.tar.gz) = edbe16745cb82dc85f387ccdff37f3a89aa670a0e3b7dae53c3762c1cc44be1fa647156000a4ddcaac66822e3e537434ce2918da72a1ad208fa5378947ecec0d
+SHA512 (cmake-3.16.1.tar.gz) = 62a8c651b1c73648420611bed3e6911da10cc5ac9131f72ef76047cb5f6e78279dc2848044279f537d9c28bb1cfa36c53bb31d00b43fa80c83f6272a1a93f4a0

commit 3060a641bf06f4485eab6c2b21ea7610af216310
Author: Bjrn Esser 
Date:   Wed Nov 27 17:08:59 2019 +0100

Exclude test "kwsys.testProcess-5" on S390X

diff --git a/cmake.spec b/cmake.spec
index fa8dccc..eb1b3d4 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -405,6 +405,12 @@ pushd build
 # CTestTestUpload require internet access
 # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
 NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
+
+# kwsys.testProcess-5 fails on S390X
+%ifarch s390x
+NO_TEST="$NO_TEST|kwsys.testProcess-5"
+%endif
+
 bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
 # Keep an eye on failing tests
 bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
@@ -479,6 +485,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 %changelog
 * Tue Nov 26 2019 Bjrn Esser  - 3.16.0-1
 - Update to 3.16.0
+- Exclude test "kwsys.testProcess-5" on S390X

* Mon Nov 18 2019 Orion Poplawski  - 3.16.0-0.1.rc4
 - Update to 3.16.0-rc4

commit 3546dfaf75ee001b365ca19e7c04cc77b0d53b12
Author: Bjrn Esser 
Date:   Tue Nov 26 19:38:55 2019 +0100

Update to 3.16.0

diff --git a/cmake.spec b/cmake.spec
index f662557..fa8dccc 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -54,7 +54,7 @@
 %global major_version 3
 %global minor_version 16
 # Set to RC version if building RC, else %%{nil}
-%global rcsuf rc4
+#global rcsuf %%{nil}
 %{?rcsuf:%global relsuf .%{rcsuf}}
 %{?rcsuf:%global versuf -%{rcsuf}}

@@ -64,7 +64,7 @@

Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.0
-Release:        0.1%{?relsuf}%{?dist}
+Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -477,6 +477,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Tue Nov 26 2019 Bjrn Esser  - 3.16.0-1
+- Update to 3.16.0
+
 * Mon Nov 18 2019 Orion Poplawski  - 3.16.0-0.1.rc4
 - Update to 3.16.0-rc4
 - Cleanup %%check
diff --git a/sources b/sources
index 37cd6ad..af8496f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.16.0-rc4.tar.gz) = 833c2aec8d19b8402bff2c7790914d2be325c3ae334038d554435214b3f702b4501cc0942e1894b745261e4932dd74ade4a790ccd917bad83bbb2435b9395572
+SHA512 (cmake-3.16.0.tar.gz) = edbe16745cb82dc85f387ccdff37f3a89aa670a0e3b7dae53c3762c1cc44be1fa647156000a4ddcaac66822e3e537434ce2918da72a1ad208fa5378947ecec0d

commit 3648c4d8a2c35e3e74e5049099ecb222966ebf13
Author: Orion Poplawski 
Date:   Mon Nov 18 21:00:59 2019 -0700

Update to 3.6.0-rc4

diff --git a/cmake.spec b/cmake.spec
index 653ca3b..f662557 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -52,9 +52,9 @@
 %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}

%global major_version 3
-%global minor_version 15
+%global minor_version 16
 # Set to RC version if building RC, else %%{nil}
-#global rcsuf rc3
+%global rcsuf rc4
 %{?rcsuf:%global relsuf .%{rcsuf}}
 %{?rcsuf:%global versuf -%{rcsuf}}

@@ -63,8 +63,8 @@
 %global orig_name cmake

Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.5
-Release:        2%{?relsuf}%{?dist}
+Version:        %{major_version}.%{minor_version}.0
+Release:        0.1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -142,6 +142,7 @@ BuildRequires:  zlib-devel
 %if %{with emacs}
 BuildRequires:  emacs
 %endif
+BuildRequires:  openssl-devel
 %if %{with rpm}
 %if %{with python3}
 %{!?python3_pkgversion: %global python3_pkgversion 3}
@@ -401,20 +402,12 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
 mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled
 %endif
 pushd build
-#CMake.FileDownload, CTestTestUpload, and curl require internet access
-# RunCMake.CPack_RPM is broken if disttag contains "+", bug #1499151
-NO_TEST="CMake.FileDownload|CTestTestUpload|curl|RunCMake.CPack_RPM"
-NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-IgnoreGroup"
-# RunCMake.File_Generate fails on S390X
-%ifarch s390x
-NO_TEST="$NO_TEST|RunCMake.File_Generate"
-NO_TEST="$NO_TEST|kwsys.testProcess-.*"
-NO_TEST="$NO_TEST|CTestTestTimeout"
-NO_TEST="$NO_TEST|CTestTestRerunFailed"
-NO_TEST="$NO_TEST|Server"
-%endif
-export NO_TEST
-bin/ctest%{?name_suffix} -V -E "$NO_TEST" %{?_smp_mflags}
+# CTestTestUpload require internet access
+# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
+NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
+bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
+# Keep an eye on failing tests
+bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
 popd
 %if 0%{?rhel} && 0%{?rhel} <= 6
 mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
@@ -484,6 +477,10 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Mon Nov 18 2019 Orion Poplawski  - 3.16.0-0.1.rc4
+- Update to 3.16.0-rc4
+- Cleanup %%check
+
 * Thu Nov 14 2019 Bjrn Esser  - 3.15.5-2
 - Rebuild (jsoncpp)
 - Exclude more tests failing on s390x
diff --git a/sources b/sources
index 06f2c58..37cd6ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.15.5.tar.gz) = c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6
+SHA512 (cmake-3.16.0-rc4.tar.gz) = 833c2aec8d19b8402bff2c7790914d2be325c3ae334038d554435214b3f702b4501cc0942e1894b745261e4932dd74ade4a790ccd917bad83bbb2435b9395572

commit 36cafa45d7c5cf657e64240e35bbd61a007b4e2c
Author: Bjrn Esser 
Date:   Fri Nov 15 19:39:52 2019 +0100

Update %changelog

diff --git a/cmake.spec b/cmake.spec
index 24d9b79..653ca3b 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -486,6 +486,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 %changelog
 * Thu Nov 14 2019 Bjrn Esser  - 3.15.5-2
 - Rebuild (jsoncpp)
+- Exclude more tests failing on s390x

* Wed Oct 30 2019 Orion Poplawski  - 3.15.5-1
 - Update to 3.15.5

commit d6736308579198ffe339e477625f3c40d2060522
Author: Bjrn Esser 
Date:   Fri Nov 15 09:02:55 2019 +0100

Disable bootstrap for jsoncpp again

diff --git a/cmake.spec b/cmake.spec
index 2b37fc5..24d9b79 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@

# Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
-%bcond_without bootstrap
+%bcond_with bootstrap

# Build with Emacs support
 %bcond_without emacs

commit cbd95056bc0ff8682f484deaf1fa53621b25193a
Author: Bjrn Esser 
Date:   Fri Nov 15 19:17:56 2019 +0100

Exclude more failing tests on s390x

diff --git a/cmake.spec b/cmake.spec
index 4c332c2..2b37fc5 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -408,10 +408,10 @@ NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-IgnoreGroup"
 # RunCMake.File_Generate fails on S390X
 %ifarch s390x
 NO_TEST="$NO_TEST|RunCMake.File_Generate"
-NO_TEST="$NO_TEST|kwsys.testProcess-4"
-NO_TEST="$NO_TEST|kwsys.testProcess-5"
+NO_TEST="$NO_TEST|kwsys.testProcess-.*"
 NO_TEST="$NO_TEST|CTestTestTimeout"
 NO_TEST="$NO_TEST|CTestTestRerunFailed"
+NO_TEST="$NO_TEST|Server"
 %endif
 export NO_TEST
 bin/ctest%{?name_suffix} -V -E "$NO_TEST" %{?_smp_mflags}

commit 3c38508291db3ba782e7793462e8b60066e858f2
Author: Bjrn Esser 
Date:   Fri Nov 15 09:01:38 2019 +0100

Exclude another failing test on s390x

diff --git a/cmake.spec b/cmake.spec
index f368abe..4c332c2 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -411,6 +411,7 @@ NO_TEST="$NO_TEST|RunCMake.File_Generate"
 NO_TEST="$NO_TEST|kwsys.testProcess-4"
 NO_TEST="$NO_TEST|kwsys.testProcess-5"
 NO_TEST="$NO_TEST|CTestTestTimeout"
+NO_TEST="$NO_TEST|CTestTestRerunFailed"
 %endif
 export NO_TEST
 bin/ctest%{?name_suffix} -V -E "$NO_TEST" %{?_smp_mflags}

commit 453d15e9a8ed638672759cee9172e78ff660fe49
Author: Bjrn Esser 
Date:   Fri Nov 15 08:12:28 2019 +0100

Exclude more tests failing on s390x

diff --git a/cmake.spec b/cmake.spec
index 8c2027a..f368abe 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -408,6 +408,9 @@ NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-IgnoreGroup"
 # RunCMake.File_Generate fails on S390X
 %ifarch s390x
 NO_TEST="$NO_TEST|RunCMake.File_Generate"
+NO_TEST="$NO_TEST|kwsys.testProcess-4"
+NO_TEST="$NO_TEST|kwsys.testProcess-5"
+NO_TEST="$NO_TEST|CTestTestTimeout"
 %endif
 export NO_TEST
 bin/ctest%{?name_suffix} -V -E "$NO_TEST" %{?_smp_mflags}

commit 95616513c5b7e52d186cdec5bf503c2a372bd901
Author: Bjrn Esser 
Date:   Fri Nov 15 08:09:54 2019 +0100

Enable bootstrap for jsoncpp again

diff --git a/cmake.spec b/cmake.spec
index b6361c6..8c2027a 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@

# Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
-%bcond_with bootstrap
+%bcond_without bootstrap

# Build with Emacs support
 %bcond_without emacs

commit 61a423448468725be2481b94f7eeed5c55010b55
Author: Bjrn Esser 
Date:   Thu Nov 14 20:35:35 2019 +0100

Disable bootstrap for jsoncpp

diff --git a/cmake.spec b/cmake.spec
index 8c2027a..b6361c6 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@

# Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
-%bcond_without bootstrap
+%bcond_with bootstrap

# Build with Emacs support
 %bcond_without emacs

commit f36d7d2cd16f2c9b37c9affa9376e5a7eb9b2e2d
Author: Bjrn Esser 
Date:   Thu Nov 14 20:33:56 2019 +0100

Rebuild (jsoncpp)

diff --git a/cmake.spec b/cmake.spec
index 7b4d307..8c2027a 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@

# Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
-%bcond_with bootstrap
+%bcond_without bootstrap

# Build with Emacs support
 %bcond_without emacs
@@ -64,7 +64,7 @@

Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.5
-Release:        1%{?relsuf}%{?dist}
+Release:        2%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -480,6 +480,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Thu Nov 14 2019 Bjrn Esser  - 3.15.5-2
+- Rebuild (jsoncpp)
+
 * Wed Oct 30 2019 Orion Poplawski  - 3.15.5-1
 - Update to 3.15.5

commit 7e7cc590d0efd15e5a975995cf167e53d63b750a
Author: Orion Poplawski 
Date:   Wed Oct 30 20:30:02 2019 -0600

Update to 3.15.5

diff --git a/cmake.spec b/cmake.spec
index 7445bc9..7b4d307 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -63,7 +63,7 @@
 %global orig_name cmake

Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.4
+Version:        %{major_version}.%{minor_version}.5
 Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

@@ -480,6 +480,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Wed Oct 30 2019 Orion Poplawski  - 3.15.5-1
+- Update to 3.15.5
+
 * Wed Oct 16 2019 Orion Poplawski  - 3.15.4-1
 - Update to 3.15.4

diff --git a/sources b/sources
index d427f03..06f2c58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.15.4.tar.gz) = 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650
+SHA512 (cmake-3.15.5.tar.gz) = c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6

commit 7fbdb8f1258b0ef6dd8aa13382ca57747e83abc7
Author: Orion Poplawski 
Date:   Wed Oct 16 22:03:02 2019 -0600

Update to 3.15.4

diff --git a/cmake.spec b/cmake.spec
index 51f0525..7445bc9 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -63,7 +63,7 @@
 %global orig_name cmake

Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.3
+Version:        %{major_version}.%{minor_version}.4
 Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

@@ -480,6 +480,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Wed Oct 16 2019 Orion Poplawski  - 3.15.4-1
+- Update to 3.15.4
+
 * Mon Sep 30 2019 Orion Poplawski  - 3.15.3-1
 - Update to 3.15.3

diff --git a/sources b/sources
index 75b3e66..d427f03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.15.3.tar.gz) = 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
+SHA512 (cmake-3.15.4.tar.gz) = 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650

commit 214ee01016950c91814ccfa27e61bea70b52efd1
Author: Orion Poplawski 
Date:   Tue Oct 1 20:27:06 2019 -0600

Update to 3.15.3

diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index 7254d8a..ec28253 100644
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -1,21 +1,20 @@
-Index: cmake-3.14.0/Modules/FindRuby.cmake
-===================================================================
---- cmake-3.14.0.orig/Modules/FindRuby.cmake
-+++ cmake-3.14.0/Modules/FindRuby.cmake
+diff -up cmake-3.15.3/Modules/FindRuby.cmake.orig cmake-3.15.3/Modules/FindRuby.cmake
+--- cmake-3.15.3/Modules/FindRuby.cmake.orig	2019-09-30 22:18:24.213679271 -0600
++++ cmake-3.15.3/Modules/FindRuby.cmake	2019-09-30 22:19:24.177961574 -0600
 @@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
-    _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-    _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
+   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)

--   # vendor_ruby available ?
--   execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
--      OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
+-  # vendor_ruby available ?
+-  execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
+-    OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
 -
--   if(RUBY_HAS_VENDOR_RUBY)
--      _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
--      _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
--   endif()
-+   _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+   _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+-  if(RUBY_HAS_VENDOR_RUBY)
+-    _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
+-    _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+-  endif()
++  _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_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)
+   # 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)
diff --git a/cmake.spec b/cmake.spec
index 1080ae4..51f0525 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -52,7 +52,7 @@
 %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}

%global major_version 3
-%global minor_version 14
+%global minor_version 15
 # Set to RC version if building RC, else %%{nil}
 #global rcsuf rc3
 %{?rcsuf:%global relsuf .%{rcsuf}}
@@ -63,8 +63,8 @@
 %global orig_name cmake

Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.5
-Release:        4%{?relsuf}%{?dist}
+Version:        %{major_version}.%{minor_version}.3
+Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -480,6 +480,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Mon Sep 30 2019 Orion Poplawski  - 3.15.3-1
+- Update to 3.15.3
+
 * Wed Jul 24 2019 Fedora Release Engineering  - 3.14.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

diff --git a/sources b/sources
index 76f660c..75b3e66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.14.5.tar.gz) = 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
+SHA512 (cmake-3.15.3.tar.gz) = 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658

commit f46ed727034b25be0519a262ce8ac90fc0f941bb
Author: Fedora Release Engineering 
Date:   Wed Jul 24 20:29:45 2019 +0000

- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering

diff --git a/cmake.spec b/cmake.spec
index 65ccde3..1080ae4 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -64,7 +64,7 @@

Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.5
-Release:        3%{?relsuf}%{?dist}
+Release:        4%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -480,6 +480,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Wed Jul 24 2019 Fedora Release Engineering  - 3.14.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jul 03 2019 Bjrn Esser  - 3.14.5-3
 - Rebuild (jsoncpp), qt5 enabled

commit 6bbe38cafad4c48eb1afa432f348bc7614a98636
Author: Bjrn Esser 
Date:   Wed Jul 3 20:11:56 2019 +0200

Fix a typo

diff --git a/cmake.spec b/cmake.spec
index 878291f..65ccde3 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -34,7 +34,7 @@

# Sphinx-build cannot import CMakeLexer on EPEL <= 6
 %if 0%{?rhel} && 0%{?rhel} <= 6
-%bcond_with sphin
+%bcond_with sphinx
 %else
 %bcond_without sphinx
 %endif

commit af45ad89da7d2b1ecc28bddeec706d3fd55780f0
Author: Bjrn Esser 
Date:   Wed Jul 3 17:39:08 2019 +0200

Enable qt5 after bootstrap

This reverts commit 4b5b373342a149c9e259d8190682ee62e0ea0c0b.

diff --git a/cmake.spec b/cmake.spec
index 1fb96be..878291f 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,7 +17,7 @@
 %bcond_without git_test

# Set to bcond_with or use --without gui to disable qt4 gui build
-%bcond_with gui
+%bcond_without gui

# Use ncurses for colorful output
 %bcond_without ncurses
@@ -64,7 +64,7 @@

Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.5
-Release:        2%{?relsuf}%{?dist}
+Release:        3%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -480,6 +480,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Wed Jul 03 2019 Bjrn Esser  - 3.14.5-3
+- Rebuild (jsoncpp), qt5 enabled
+
 * Wed Jul 03 2019 Bjrn Esser  - 3.14.5-2
 - Rebuild (jsoncpp), bootstrap without qt5
 - Ignore a test failing with rpm-4.15

commit e2928d0221dd46cc0f80b27efa810ed103b7e32d
Author: Bjrn Esser 
Date:   Wed Jul 3 16:43:14 2019 +0200

Ignore a test failing with rpm-4.15

diff --git a/cmake.spec b/cmake.spec
index e3cb561..1fb96be 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -404,6 +404,7 @@ pushd build
 #CMake.FileDownload, CTestTestUpload, and curl require internet access
 # RunCMake.CPack_RPM is broken if disttag contains "+", bug #1499151
 NO_TEST="CMake.FileDownload|CTestTestUpload|curl|RunCMake.CPack_RPM"
+NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-IgnoreGroup"
 # RunCMake.File_Generate fails on S390X
 %ifarch s390x
 NO_TEST="$NO_TEST|RunCMake.File_Generate"
@@ -481,6 +482,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 %changelog
 * Wed Jul 03 2019 Bjrn Esser  - 3.14.5-2
 - Rebuild (jsoncpp), bootstrap without qt5
+- Ignore a test failing with rpm-4.15

* Fri May 31 2019 Bjrn Esser  - 3.14.5-1
 - 3.14.5

commit 4b5b373342a149c9e259d8190682ee62e0ea0c0b
Author: Bjrn Esser 
Date:   Wed Jul 3 16:41:06 2019 +0200

Revert "Enable qt5 after bootstrap"

This reverts commit fe93f704361500762d2a0bd5405a13d01ef4001c.

diff --git a/cmake.spec b/cmake.spec
index 29214df..e3cb561 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,7 +17,7 @@
 %bcond_without git_test

# Set to bcond_with or use --without gui to disable qt4 gui build
-%bcond_without gui
+%bcond_with gui

# Use ncurses for colorful output
 %bcond_without ncurses
@@ -64,7 +64,7 @@

Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.5
-Release:        3%{?relsuf}%{?dist}
+Release:        2%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -479,9 +479,6 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
-* Wed Jul 03 2019 Bjrn Esser  - 3.14.5-3
-- Rebuild (jsoncpp), qt5 enabled
-
 * Wed Jul 03 2019 Bjrn Esser  - 3.14.5-2
 - Rebuild (jsoncpp), bootstrap without qt5

commit fe93f704361500762d2a0bd5405a13d01ef4001c
Author: Bjrn Esser 
Date:   Wed Jul 3 14:05:36 2019 +0200

Enable qt5 after bootstrap

diff --git a/cmake.spec b/cmake.spec
index e3cb561..29214df 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,7 +17,7 @@
 %bcond_without git_test

# Set to bcond_with or use --without gui to disable qt4 gui build
-%bcond_with gui
+%bcond_without gui

# Use ncurses for colorful output
 %bcond_without ncurses
@@ -64,7 +64,7 @@

Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.5
-Release:        2%{?relsuf}%{?dist}
+Release:        3%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -479,6 +479,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Wed Jul 03 2019 Bjrn Esser  - 3.14.5-3
+- Rebuild (jsoncpp), qt5 enabled
+
 * Wed Jul 03 2019 Bjrn Esser  - 3.14.5-2
 - Rebuild (jsoncpp), bootstrap without qt5

commit 5d34009bffe0c32517d3ba9aebfb5b5a1175c65a
Author: Bjrn Esser 
Date:   Wed Jul 3 13:59:48 2019 +0200

Bootstrap without qt5

diff --git a/cmake.spec b/cmake.spec
index af00ae3..e3cb561 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,7 +17,7 @@
 %bcond_without git_test

# Set to bcond_with or use --without gui to disable qt4 gui build
-%bcond_without gui
+%bcond_with gui

# Use ncurses for colorful output
 %bcond_without ncurses
@@ -480,7 +480,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
 * Wed Jul 03 2019 Bjrn Esser  - 3.14.5-2
-- Rebuild (jsoncpp)
+- Rebuild (jsoncpp), bootstrap without qt5

* Fri May 31 2019 Bjrn Esser  - 3.14.5-1
 - 3.14.5

commit 257d63bdb54c8fa577b4768f4171605a9cc09048
Author: Bjrn Esser 
Date:   Wed Jul 3 13:29:29 2019 +0200

Rebuild (jsoncpp)

diff --git a/cmake.spec b/cmake.spec
index c7c4a9b..af00ae3 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -64,7 +64,7 @@

Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.5
-Release:        1%{?relsuf}%{?dist}
+Release:        2%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

# most sources are BSD
@@ -479,6 +479,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

%changelog
+* Wed Jul 03 2019 Bjrn Esser  - 3.14.5-2
+- Rebuild (jsoncpp)
+
 * Fri May 31 2019 Bjrn Esser  - 3.14.5-1
 - 3.14.5