From f9cb511aa74149d713f06cbdaf1ed40f431b5901 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:03:17 +0000 Subject: import cmake-2.8.12.2-2.el7 --- diff --git a/.cmake.metadata b/.cmake.metadata index e934c59..07cf76f 100644 --- a/.cmake.metadata +++ b/.cmake.metadata @@ -1 +1 @@ -7b7961402ec71d84052734da1bed2b28e6a2c4af SOURCES/cmake-2.8.11.tar.gz +cca70b307aa32a6a32c72e01fdfcecc84c1c2690 SOURCES/cmake-2.8.12.2.tar.gz diff --git a/.gitignore b/.gitignore index aeca137..a816f20 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cmake-2.8.11.tar.gz +SOURCES/cmake-2.8.12.2.tar.gz diff --git a/SOURCES/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch b/SOURCES/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch deleted file mode 100644 index 9afa51a..0000000 --- a/SOURCES/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up cmake-2.8.11-rc1/Modules/FindImageMagick.cmake.IM_pkgconfig_hints cmake-2.8.11-rc1/Modules/FindImageMagick.cmake ---- cmake-2.8.11-rc1/Modules/FindImageMagick.cmake.IM_pkgconfig_hints 2013-03-14 13:10:40.000000000 -0500 -+++ cmake-2.8.11-rc1/Modules/FindImageMagick.cmake 2013-03-18 09:18:09.453420248 -0500 -@@ -69,17 +69,24 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+find_package(PkgConfig QUIET) -+ - #--------------------------------------------------------------------- - # Helper functions - #--------------------------------------------------------------------- - function(FIND_IMAGEMAGICK_API component header) - set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE) - -+ pkg_check_modules(PC_${component} QUIET ${component}) -+ - find_path(ImageMagick_${component}_INCLUDE_DIR - NAMES ${header} - PATHS - ${ImageMagick_INCLUDE_DIRS} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" -+ HINTS -+ ${PC_${component}_INCLUDEDIR} -+ ${PC_${component}_INCLUDE_DIRS} - PATH_SUFFIXES - ImageMagick - DOC "Path to the ImageMagick include dir." -@@ -88,6 +95,9 @@ function(FIND_IMAGEMAGICK_API component - NAMES ${ARGN} - PATHS - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib" -+ HINTS -+ ${PC_${component}_LIBDIR} -+ ${PC_${component}_LIB_DIRS} - DOC "Path to the ImageMagick Magick++ library." - ) - diff --git a/SOURCES/cmake-2.8.12.2-IM_pkgconfig_hints.patch b/SOURCES/cmake-2.8.12.2-IM_pkgconfig_hints.patch new file mode 100644 index 0000000..6a0db31 --- /dev/null +++ b/SOURCES/cmake-2.8.12.2-IM_pkgconfig_hints.patch @@ -0,0 +1,38 @@ +diff -Nrup a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake +--- a/Modules/FindImageMagick.cmake 2014-01-16 12:15:08.000000000 -0500 ++++ b/Modules/FindImageMagick.cmake 2016-02-29 23:07:06.439208172 -0500 +@@ -69,17 +69,24 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++find_package(PkgConfig QUIET) ++ + #--------------------------------------------------------------------- + # Helper functions + #--------------------------------------------------------------------- + function(FIND_IMAGEMAGICK_API component header) + set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE) + ++ pkg_check_modules(PC_${component} QUIET ${component}) ++ + find_path(ImageMagick_${component}_INCLUDE_DIR + NAMES ${header} + PATHS + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" ++ HINTS ++ ${PC_${component}_INCLUDEDIR} ++ ${PC_${component}_INCLUDE_DIRS} + PATH_SUFFIXES + ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." +@@ -88,6 +95,9 @@ function(FIND_IMAGEMAGICK_API component + NAMES ${ARGN} + PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib" ++ HINTS ++ ${PC_${component}_LIBDIR} ++ ${PC_${component}_LIB_DIRS} + DOC "Path to the ImageMagick Magick++ library." + ) + diff --git a/SOURCES/cmake-FindFreetype.patch b/SOURCES/cmake-FindFreetype.patch new file mode 100644 index 0000000..f591b47 --- /dev/null +++ b/SOURCES/cmake-FindFreetype.patch @@ -0,0 +1,40 @@ +diff -Nrup a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake +--- a/Modules/FindFreetype.cmake 2014-01-16 12:15:08.000000000 -0500 ++++ b/Modules/FindFreetype.cmake 2016-03-02 17:06:31.962906464 -0500 +@@ -70,6 +70,19 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 + PATH_SUFFIXES include/freetype2 include + ) + ++if(NOT FREETYPE_INCLUDE_DIR_freetype2) ++ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h ++ HINTS ++ ENV FREETYPE_DIR ++ PATHS ++ /usr/X11R6 ++ /usr/local/X11R6 ++ /usr/local/X11 ++ /usr/freeware ++ PATH_SUFFIXES include/freetype2 include ++ ) ++endif() ++ + find_library(FREETYPE_LIBRARY + NAMES freetype libfreetype freetype219 + HINTS +@@ -91,8 +104,14 @@ if(FREETYPE_INCLUDE_DIR_ft2build AND FRE + endif() + set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") + +-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") +- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str ++if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") ++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") ++elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") ++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") ++endif() ++ ++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) ++ file(STRINGS "${FREETYPE_H}" freetype_version_str + REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") + + unset(FREETYPE_VERSION_STRING) diff --git a/SOURCES/cmake-FindPythonLibs-1.patch b/SOURCES/cmake-FindPythonLibs-1.patch new file mode 100644 index 0000000..1433d3f --- /dev/null +++ b/SOURCES/cmake-FindPythonLibs-1.patch @@ -0,0 +1,29 @@ +diff -rupN cmake/Modules/FindPythonLibs.cmake new/Modules/FindPythonLibs.cmake +--- cmake/Modules/FindPythonLibs.cmake 2013-04-12 14:09:08.470669049 -0500 ++++ new/Modules/FindPythonLibs.cmake 2013-04-12 15:41:15.789496153 -0500 +@@ -69,10 +69,21 @@ endif() + + # Set up the versions we know about, in the order we will search. Always add + # the user supplied additional versions to the front. +-set(_Python_VERSIONS +- ${Python_ADDITIONAL_VERSIONS} +- ${_PYTHON_FIND_OTHER_VERSIONS} +- ) ++# If FindPythonInterp has already found the major and minor version, ++# insert that version between the user supplied versions and the stock ++# version list. ++if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR) ++ set(_Python_VERSIONS ++ ${Python_ADDITIONAL_VERSIONS} ++ ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ++ ${_PYTHON_FIND_OTHER_VERSIONS} ++ ) ++else() ++ set(_Python_VERSIONS ++ ${Python_ADDITIONAL_VERSIONS} ++ ${_PYTHON_FIND_OTHER_VERSIONS} ++ ) ++endif() + + unset(_PYTHON_FIND_OTHER_VERSIONS) + unset(_PYTHON1_VERSIONS) diff --git a/SOURCES/cmake-FindPythonLibs-2.patch b/SOURCES/cmake-FindPythonLibs-2.patch new file mode 100644 index 0000000..949e6e4 --- /dev/null +++ b/SOURCES/cmake-FindPythonLibs-2.patch @@ -0,0 +1,12 @@ +diff -Nrup a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +--- a/Modules/FindPythonLibs.cmake 2014-01-16 12:15:08.000000000 -0500 ++++ b/Modules/FindPythonLibs.cmake 2016-02-28 23:21:53.334794362 -0500 +@@ -38,7 +38,7 @@ CMAKE_FIND_FRAMEWORKS(Python) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) + + if(PythonLibs_FIND_VERSION) + if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$") diff --git a/SOURCES/cmake-boostmpi.patch b/SOURCES/cmake-boostmpi.patch new file mode 100644 index 0000000..91123cb --- /dev/null +++ b/SOURCES/cmake-boostmpi.patch @@ -0,0 +1,66 @@ +commit a22eeca3fd7fe022e06001428d5e903913467fa0 +Author: Brad King +Date: Fri Feb 7 16:45:10 2014 -0500 + + FindBoost: Search next to MPI libraries for boost_mpi (#14739) + + Some distributions place boost_mpi next to the MPI libraries against + which it was built instead of next to the other Boost libraries. If + find_package(MPI) has already been run prior to find_package(Boost) then + MPI_CXX_LIBRARIES or MPI_C_LIBRARIES may be set to the location of the + MPI libraries. Teach FindBoost.cmake to look there for boost_mpi and + boost_mpi_python after looking next to the other Boost libraries but + not consider the location to be Boost_LIBRARY_DIR. + +diff -Nrup a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +--- a/Modules/FindBoost.cmake 2014-01-16 12:15:08.000000000 -0500 ++++ b/Modules/FindBoost.cmake 2016-03-02 16:10:18.252811225 -0500 +@@ -279,10 +279,15 @@ endmacro() + macro(_Boost_FIND_LIBRARY var) + find_library(${var} ${ARGN}) + +- # If we found the first library save Boost_LIBRARY_DIR. +- if(${var} AND NOT Boost_LIBRARY_DIR) +- get_filename_component(_dir "${${var}}" PATH) +- set(Boost_LIBRARY_DIR "${_dir}" CACHE PATH "Boost library directory" FORCE) ++ if(${var}) ++ # If this is the first library found then save Boost_LIBRARY_DIR. ++ if(NOT Boost_LIBRARY_DIR) ++ get_filename_component(_dir "${${var}}" PATH) ++ set(Boost_LIBRARY_DIR "${_dir}" CACHE PATH "Boost library directory" FORCE) ++ endif() ++ elseif(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT) ++ # Try component-specific hints but do not save Boost_LIBRARY_DIR. ++ find_library(${var} HINTS ${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT} ${ARGN}) + endif() + + # If Boost_LIBRARY_DIR is known then search only there. +@@ -906,6 +911,28 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT + set( _boost_docstring_release "Boost ${COMPONENT} library (release)") + set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") + ++ # Compute component-specific hints. ++ set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "") ++ if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python") ++ foreach(lib ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES}) ++ if(IS_ABSOLUTE "${lib}") ++ get_filename_component(libdir "${lib}" PATH) ++ string(REPLACE "\\" "/" libdir "${libdir}") ++ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT ${libdir}) ++ endif() ++ endforeach() ++ endif() ++ ++ # Consolidate and report component-specific hints. ++ if(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT) ++ list(REMOVE_DUPLICATES _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT) ++ if(Boost_DEBUG) ++ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ "Component-specific library search paths for ${COMPONENT}: " ++ "${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT}") ++ endif() ++ endif() ++ + # + # Find RELEASE libraries + # diff --git a/SOURCES/cmake-findruby.patch b/SOURCES/cmake-findruby.patch index 6c60931..64a54df 100644 --- a/SOURCES/cmake-findruby.patch +++ b/SOURCES/cmake-findruby.patch @@ -1,7 +1,7 @@ -diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake ---- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby 2012-10-02 10:12:18.000000000 -0600 -+++ cmake-2.8.10-rc1/Modules/FindRuby.cmake 2012-10-02 15:50:30.463292214 -0600 -@@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO +diff -Nrup a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake +--- a/Modules/FindRuby.cmake 2014-01-16 12:15:08.000000000 -0500 ++++ b/Modules/FindRuby.cmake 2016-03-02 16:10:18.242811297 -0500 +@@ -101,14 +101,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) diff --git a/SOURCES/cmake-fix-mingw32-builds-of-Qt4.patch b/SOURCES/cmake-fix-mingw32-builds-of-Qt4.patch new file mode 100644 index 0000000..7204462 --- /dev/null +++ b/SOURCES/cmake-fix-mingw32-builds-of-Qt4.patch @@ -0,0 +1,55 @@ +diff -Nrup a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake +--- a/Modules/FindQt4.cmake 2014-01-16 12:15:08.000000000 -0500 ++++ b/Modules/FindQt4.cmake 2016-02-29 18:39:54.384628635 -0500 +@@ -886,16 +886,20 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) + endforeach() + + if(Q_WS_WIN) +- set(QT_MODULES ${QT_MODULES} QAxContainer QAxServer) +- # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR +- find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt +- PATHS ${QT_HEADERS_DIR}/ActiveQt +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH +- ) +- find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt +- PATHS ${QT_HEADERS_DIR}/ActiveQt +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH +- ) ++ if (QT_QAXCONTAINER_FOUND) ++ set(QT_MODULES ${QT_MODULES} QAxContainer) ++ # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR ++ find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt ++ PATHS ${QT_HEADERS_DIR}/ActiveQt ++ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ++ ) ++ endif() ++ if (QT_QAXSERVER_FOUND) ++ find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt ++ PATHS ${QT_HEADERS_DIR}/ActiveQt ++ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ++ ) ++ endif() + endif() + + # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR +@@ -1057,8 +1061,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) + if(Q_WS_WIN) + _QT4_ADJUST_LIB_VARS(qtmain) + +- _QT4_ADJUST_LIB_VARS(QAxServer) + if(QT_QAXSERVER_FOUND) ++ _QT4_ADJUST_LIB_VARS(QAxServer) + set_property(TARGET Qt4::QAxServer PROPERTY + INTERFACE_QT4_NO_LINK_QTMAIN ON + ) +@@ -1066,7 +1070,9 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) + COMPATIBLE_INTERFACE_BOOL QT4_NO_LINK_QTMAIN) + endif() + +- _QT4_ADJUST_LIB_VARS(QAxContainer) ++ if(QT_QAXCONTAINER_FOUND) ++ _QT4_ADJUST_LIB_VARS(QAxContainer) ++ endif() + endif() + + # Only public dependencies are listed here. diff --git a/SOURCES/cmake-qtdeps.patch b/SOURCES/cmake-qtdeps.patch new file mode 100644 index 0000000..a22eb0d --- /dev/null +++ b/SOURCES/cmake-qtdeps.patch @@ -0,0 +1,54 @@ +diff -up cmake-2.8.12/Modules/UseQt4.cmake.qtdeps cmake-2.8.12/Modules/UseQt4.cmake +--- cmake-2.8.12/Modules/UseQt4.cmake.qtdeps 2013-10-07 09:31:00.000000000 -0600 ++++ cmake-2.8.12/Modules/UseQt4.cmake 2013-10-23 10:39:14.763568925 -0600 +@@ -56,39 +56,13 @@ if (QT_USE_QT3SUPPORT) + add_definitions(-DQT3_SUPPORT) + endif () + +-# list dependent modules, so dependent libraries are added +-set(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE) +-set(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE) +-set(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE) +-set(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE) +-if(QT_QTDBUS_FOUND) +- set(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE) +-else() +- set(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE) +-endif() +-set(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE) +-set(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE) +-set(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE) +-set(QT_QTDECLARATIVE_MODULE_DEPENDS QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTGUI QTCORE) +-set(QT_QTMULTIMEDIA_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QTOPENGL_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QTSCRIPT_MODULE_DEPENDS QTCORE) +-set(QT_QTGUI_MODULE_DEPENDS QTCORE) +-set(QT_QTTEST_MODULE_DEPENDS QTCORE) +-set(QT_QTXML_MODULE_DEPENDS QTCORE) +-set(QT_QTSQL_MODULE_DEPENDS QTCORE) +-set(QT_QTNETWORK_MODULE_DEPENDS QTCORE) +- + # Qt modules (in order of dependence) + foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN + QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP + QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTXMLPATTERNS QTGUI QTTEST + QTDBUS QTXML QTSQL QTNETWORK QTCORE) + +- if (QT_USE_${module} OR QT_USE_${module}_DEPENDS) ++ if (QT_USE_${module}) + if (QT_${module}_FOUND) + if(QT_USE_${module}) + string(REPLACE "QT" "" qt_module_def "${module}") +@@ -104,9 +78,6 @@ foreach(module QT3SUPPORT QTOPENGL QTASS + if(QT_IS_STATIC) + set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES}) + endif() +- foreach(depend_module ${QT_${module}_MODULE_DEPENDS}) +- set(QT_USE_${depend_module}_DEPENDS 1) +- endforeach() + else () + message("Qt ${module} library not found.") + endif () diff --git a/SPECS/cmake.spec b/SPECS/cmake.spec index db15c74..82ef24b 100644 --- a/SPECS/cmake.spec +++ b/SPECS/cmake.spec @@ -12,8 +12,8 @@ %endif Name: cmake -Version: 2.8.11 -Release: 5%{?dist} +Version: 2.8.12.2 +Release: 2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -40,7 +40,7 @@ Patch2: cmake-findruby.patch Patch3: cmake-FindPostgreSQL.patch # Patch FindImageMagick.cmake for newer ImageMagick versions # http://public.kitware.com/Bug/view.php?id=14012 -Patch4: cmake-2.8.11-rc1-IM_pkgconfig_hints.patch +Patch4: cmake-2.8.12.2-IM_pkgconfig_hints.patch # Add FindLua52.cmake Patch5: cmake-2.8.11-rc4-lua-5.2.patch # Fix strict aliasing problems in cm_sha2.c @@ -49,6 +49,24 @@ Patch6: cmake-strict_aliasing.patch Patch7: cmake-desktop_icon.patch # FindJNI: Add ppc64le architecture Patch8: cmake-FindJNI.patch +# # Fix issue with finding consistent python versions +# http://public.kitware.com/Bug/view.php?id=13794 +# https://bugzilla.redhat.com/show_bug.cgi?id=876118 +Patch9: cmake-FindPythonLibs-1.patch +# BZ 1246369 add support for python version 3.4 +Patch10: cmake-FindPythonLibs-2.patch +# Upstream patch to find Boost MPI library +# http://www.cmake.org/Bug/view.php?id=14739 +# https://bugzilla.redhat.com/show_bug.cgi?id=756141 +Patch11: cmake-boostmpi.patch +# Fix FindFreetype for 2.5.1+ +# http://public.kitware.com/Bug/view.php?id=14601 +Patch12: cmake-FindFreetype.patch +# Remove automatic Qt module dep adding +Patch13: cmake-qtdeps.patch +# BZ 1192188 Don't fail if certain Qt modules are unavailable. +Patch14: cmake-fix-mingw32-builds-of-Qt4.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran @@ -106,6 +124,12 @@ The %{name}-gui package contains the Qt based GUI for CMake. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build @@ -202,6 +226,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Wed Mar 02 2016 Patsy Franklin - 2.8.12.2-2 +- Clean up patches and get rid of .orig files. + +* Fri Feb 26 2016 Patsy Franklin - 2.8.12.2-1 +- Rebase to 2.8.12.2 including some recent patches. (BZ #1195919) +- Fix to find python libs version 3.4 (BZ #1246369) +- Don't fail if certain Qt modules are unavailable. (BZ #1192188) + * Wed Aug 20 2014 Patsy Franklin - 2.8.11-5 - Add support for ppc64le to FindJNI.cmake.