- more x32 macro fixes

- rel 2

diff --git a/cmake-libx32.patch b/cmake-libx32.patch
index 3d43e88741738e14bebb1852607d76fd30b7c052..116a26d35670bec2cfdc75894d99136b00ef8e2f 100644 (file)
--- a/cmake-libx32.patch
+++ b/cmake-libx32.patch
@@ -72,6 +72,81 @@ diff -urN cmake-3.1.3/Modules/KDE3Macros.cmake cmake-3.1.3.x32/Modules/KDE3Macro
  
     install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
  endmacro()
+--- cmake-3.2.2/Modules/FindGTK2.cmake~        2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Modules/FindGTK2.cmake 2015-05-24 15:59:18.104019082 +0200
+@@ -263,8 +263,10 @@
+     find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr}
+         PATHS
+             ${_gtk2_arch_dir}
++            /usr/local/libx32
+             /usr/local/lib64
+             /usr/local/lib
++            /usr/libx32
+             /usr/lib64
+             /usr/lib
+             /usr/X11R6/include
+--- cmake-3.2.2/Modules/CPackRPM.cmake~        2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Modules/CPackRPM.cmake 2015-05-24 16:00:57.195091040 +0200
+@@ -979,7 +979,7 @@
+ endif()
+ 
+ if (NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
+-  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include)
++  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/libx32 /usr/include)
+   if (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
+     message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
+     list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
+--- cmake-3.2.2/Modules/FindDevIL.cmake~       2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Modules/FindDevIL.cmake        2015-05-24 16:02:11.395903299 +0200
+@@ -56,7 +56,7 @@
+ 
+ find_library(IL_LIBRARIES
+   NAMES IL DEVIL
+-  PATH_SUFFIXES lib64 lib lib32
++  PATH_SUFFIXES libx32 lib64 lib lib32
+   DOC "The file that corresponds to the base il library."
+ )
+ 
+@@ -64,7 +64,7 @@
+ 
+ find_library(ILUT_LIBRARIES
+   NAMES ILUT
+-  PATH_SUFFIXES lib64 lib lib32
++  PATH_SUFFIXES libx32 lib64 lib lib32
+   DOC "The file that corresponds to the il (system?) utility library."
+ )
+ 
+@@ -72,7 +72,7 @@
+ 
+ find_library(ILU_LIBRARIES
+   NAMES ILU
+-  PATH_SUFFIXES lib64 lib lib32
++  PATH_SUFFIXES libx32 lib64 lib lib32
+   DOC "The file that corresponds to the il utility library."
+ )
+ 
+--- cmake-3.2.2/Modules/FindGLEW.cmake~        2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Modules/FindGLEW.cmake 2015-05-24 16:02:42.286243557 +0200
+@@ -35,7 +35,7 @@
+ #  License text for the above reference.)
+ 
+ find_path(GLEW_INCLUDE_DIR GL/glew.h)
+-find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64)
++find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64 libx32)
+ 
+ set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
+ set(GLEW_LIBRARIES ${GLEW_LIBRARY})
+--- cmake-3.2.2/Modules/FindIce.cmake~ 2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Modules/FindIce.cmake  2015-05-24 16:03:30.256774179 +0200
+@@ -157,7 +157,7 @@
+   endif()
+   # Generic 64-bit and 32-bit directories
+   list(APPEND ice_binary_suffixes "bin${_x64}" "bin")
+-  list(APPEND ice_library_suffixes "${_lib64}" "lib${_x64}" "lib")
++  list(APPEND ice_library_suffixes "libx32" "${_lib64}" "lib${_x64}" "lib")
+   list(APPEND ice_include_suffixes "include")
+   list(APPEND ice_slice_suffixes "slice")
+ 
 diff -urN cmake-3.1.3/Modules/Platform/UnixPaths.cmake cmake-3.1.3.x32/Modules/Platform/UnixPaths.cmake
 --- cmake-3.1.3/Modules/Platform/UnixPaths.cmake       2015-02-11 16:17:39.000000000 +0000
 +++ cmake-3.1.3.x32/Modules/Platform/UnixPaths.cmake   2015-03-05 21:14:33.208470807 +0000

diff --git a/cmake.spec b/cmake.spec
index c8ba83f197c13d64130274e8704aa2578abebc14..f37980e7b9228f498d2d06d668cc377bf5f1859d 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -15,7 +15,7 @@ Summary:      Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
 Version:       3.2.2
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Building
 Source0:       http://www.cmake.org/files/v3.2/%{name}-%{version}.tar.gz