- updated libx23 patch, rel 2

diff --git a/cmake-libx32.patch b/cmake-libx32.patch
index 9afffbf81f1ca70fb50496dd174a2999c3c84d7d..3832bd3cd4c2d02e512cfc92c999e19ea55c834e 100644 (file)
--- a/cmake-libx32.patch
+++ b/cmake-libx32.patch
@@ -4,10 +4,10 @@
  # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
  if(NOT ZLIB_LIBRARY)
    foreach(search ${_ZLIB_SEARCHES})
  # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
  if(NOT ZLIB_LIBRARY)
    foreach(search ${_ZLIB_SEARCHES})

--    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
--    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
-+    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES libx32)
-+    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES libx32)
+-    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
+-    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
++    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES libx32)
++    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES libx32)

    endforeach()
  
    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
    endforeach()
  
    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)

diff --git a/cmake.spec b/cmake.spec
index c5ccca5bf2f935eb8c3abd7bc9f6efe4dbb2d239..8da5dcde9cab06ac196da4f0d5e222f58d67165a 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -20,7 +20,7 @@ Summary:      Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
 Version:       3.12.4
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
 Version:       3.12.4

-Release:       1
+Release:       2

 License:       BSD
 Group:         Development/Building
 Source0:       https://cmake.org/files/v3.12/%{name}-%{version}.tar.gz
 License:       BSD
 Group:         Development/Building
 Source0:       https://cmake.org/files/v3.12/%{name}-%{version}.tar.gz