From 91d8dab8829829caeb09656ce66bc95ec7207fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Thu, 16 Jul 2020 12:01:58 +0200
Subject: [PATCH] Update to 3.18.0

---
 cmake-3.18.0-rc2-lua-5.4.patch | 63 ----------------------------------
 cmake.spec                     |  9 ++---
 sources                        |  2 +-
 3 files changed, 6 insertions(+), 68 deletions(-)
 delete mode 100644 cmake-3.18.0-rc2-lua-5.4.patch

diff --git a/cmake-3.18.0-rc2-lua-5.4.patch b/cmake-3.18.0-rc2-lua-5.4.patch
deleted file mode 100644
index f13d30d..0000000
--- a/cmake-3.18.0-rc2-lua-5.4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -up cmake-3.18.0-rc2/Modules/FindLua.cmake.lua54 cmake-3.18.0-rc2/Modules/FindLua.cmake
---- cmake-3.18.0-rc2/Modules/FindLua.cmake.lua54	2020-06-30 14:17:05.897460893 -0400
-+++ cmake-3.18.0-rc2/Modules/FindLua.cmake	2020-06-30 14:17:16.173293679 -0400
-@@ -48,7 +48,7 @@ unset(_lua_append_versions)
- 
- # this is a function only to have all the variables inside go away automatically
- function(_lua_get_versions)
--    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
-+    set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0)
- 
-     if (Lua_FIND_VERSION_EXACT)
-         if (Lua_FIND_VERSION_COUNT GREATER 1)
-diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake
---- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake.lua54	2020-06-30 14:17:44.756828608 -0400
-+++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake	2020-06-30 14:18:20.411248461 -0400
-@@ -59,15 +59,15 @@ function(test_path prefix_path lua_path
- endfunction()
- 
- # Simple test
--test_path(prefix1 prefix1/include 5.3)
-+test_path(prefix1 prefix1/include 5.4)
- # Find highest version
--test_path(prefix2 prefix2/include/lua5.3 5.3)
--foreach(ver 5.3 5.2 5.1)
-+test_path(prefix2 prefix2/include/lua5.4 5.4)
-+foreach(ver 5.4 5.3 5.2 5.1)
-     # At least X or X.0 -> Highest
-     set(VERSION "${ver}")
--    test_path(prefix2 prefix2/include/lua5.3 5.3)
-+    test_path(prefix2 prefix2/include/lua5.4 5.4)
-     set(VERSION "${ver}.0")
--    test_path(prefix2 prefix2/include/lua5.3 5.3)
-+    test_path(prefix2 prefix2/include/lua5.4 5.4)
-     # Exactly X/X.0
-     set(VERSION "${ver}" EXACT)
-     test_path(prefix2 prefix2/include/lua${ver} ${ver})
-diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h
---- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h.lua54	2020-06-30 14:19:19.646284675 -0400
-+++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h	2020-06-30 14:19:11.988409288 -0400
-@@ -0,0 +1,8 @@
-+
-+#define LUA_VERSION_MAJOR "5"
-+#define LUA_VERSION_MINOR "4"
-+#define LUA_VERSION_NUM 504
-+#define LUA_VERSION_RELEASE "0"
-+
-+#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
-+#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
-diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h
---- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h.lua54	2020-06-30 15:05:35.332154492 -0400
-+++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h	2020-06-30 15:05:51.201899127 -0400
-@@ -1,8 +1,8 @@
- 
- #define LUA_VERSION_MAJOR "5"
--#define LUA_VERSION_MINOR "3"
--#define LUA_VERSION_NUM 503
--#define LUA_VERSION_RELEASE "4"
-+#define LUA_VERSION_MINOR "4"
-+#define LUA_VERSION_NUM 504
-+#define LUA_VERSION_RELEASE "0"
- 
- #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
- #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
diff --git a/cmake.spec b/cmake.spec
index 8730600..e0cb769 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -57,7 +57,7 @@
 %global major_version 3
 %global minor_version 18
 # Set to RC version if building RC, else %%{nil}
-%global rcsuf rc3
+#global rcsuf rc1
 %{?rcsuf:%global relsuf .%{rcsuf}}
 %{?rcsuf:%global versuf -%{rcsuf}}
 
@@ -67,7 +67,7 @@
 
 Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.0
-Release:        0.8%{?relsuf}%{?dist}
+Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system
 
 # most sources are BSD
@@ -98,8 +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
-# Fix FindLua to support Lua 5.4
-Patch103:       %{name}-3.18.0-rc2-lua-5.4.patch
 
 # Patch for renaming on EPEL
 %if 0%{?name_suffix:1}
@@ -503,6 +501,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 4459d23..da8da18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.18.0-rc3.tar.gz) = f4bda297c90d6449d6ef3adcf91debc61a9dbef65934dfd1447f86d30747b4b466bb813abe58ee3d6a3aa9e8e49d5e7cd118820e92bec3b2e52f06142faa017e
+SHA512 (cmake-3.18.0.tar.gz) = 6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d