]> git.pld-linux.org Git - packages/cmake.git/commitdiff
Up to 3.24.1. auto/th/cmake-3.24.1-1
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Thu, 18 Aug 2022 10:34:09 +0000 (12:34 +0200)
committerArkadiusz Miśkiewicz <arekm@maven.pl>
Thu, 18 Aug 2022 10:34:09 +0000 (12:34 +0200)
cmake-lib64.patch
cmake.spec

index 8eda9f7a4734e4a1f56498ae904060898143e408..95ec231a2770dbe84a92fd5f1cb075bc74c63f95 100644 (file)
@@ -11,9 +11,9 @@
  endmacro()
 --- cmake-3.1.0/Modules/FindZLIB.cmake~        2014-12-15 20:07:43.000000000 +0000
 +++ cmake-3.1.0/Modules/FindZLIB.cmake 2014-12-24 21:00:27.139263296 +0000
-@@ -85,8 +85,8 @@
- # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
- if(NOT ZLIB_LIBRARY)
+@@ -109,8 +109,8 @@ if(NOT ZLIB_LIBRARY)
+   endif()
    foreach(search ${_ZLIB_SEARCHES})
 -    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)
@@ -21,4 +21,5 @@
 +    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64)
    endforeach()
  
-   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+   # Restore the original find library ordering
+
index b0bcdaf025098a2c6dbd72e3a25ec0b9b154351a..ea49c8bf90423bf224dbe34160eb37a2f171a8f5 100644 (file)
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       3.23.1
-Release:       3
+Version:       3.24.1
+Release:       1
 License:       BSD
 Group:         Development/Building
-Source0:       https://cmake.org/files/v3.23/%{name}-%{version}.tar.gz
-# Source0-md5: b0d46fdcca030372f0a464146243e193
+Source0:       https://cmake.org/files/v3.24/%{name}-%{version}.tar.gz
+# Source0-md5: 3360abcd5576dc028204cd4583e6d4e9
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
 Patch2:                %{name}-jni.patch
This page took 0.165698 seconds and 4 git commands to generate.