- rel 2; fix x32 patches

diff --git a/cmake-libx32.patch b/cmake-libx32.patch
index 116a26d35670bec2cfdc75894d99136b00ef8e2f..fd013847a4881b95b4b5450a2e06663443eeaf64 100644 (file)
--- a/cmake-libx32.patch
+++ b/cmake-libx32.patch
@@ -87,15 +87,15 @@ diff -urN cmake-3.1.3/Modules/KDE3Macros.cmake cmake-3.1.3.x32/Modules/KDE3Macro
              /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()
+@@ -607,7 +607,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}")
+   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 @@

diff --git a/cmake.spec b/cmake.spec
index 0c239ea5bbc2c4226306cf4436efaf67b3384931..966d2b251de34bf941c2e44e14aff17cfa781068 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.3.2
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Building
 Source0:       http://www.cmake.org/files/v3.3/%{name}-%{version}.tar.gz