[cmake28/el6] Update to latest upstream release. Fixed warning in desktop file due to icon file with extension.
Richard Shaw
hobbes1069 at fedoraproject.org
Sun Jul 28 18:13:16 UTC 2013
commit 0cfe7f32e81c06ac3110dfe449e2dbacd119795a
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date: Sat Jul 27 22:47:51 2013 -0500
Update to latest upstream release.
Fixed warning in desktop file due to icon file with extension.
.gitignore | 1 +
cmake-2.8.11-rc1-IM_pkgconfig_hints.patch | 38 +++++++
cmake-2.8.11-rc4-lua-5.2.patch | 77 ++++++++++++++
cmake-FindPostgreSQL.patch | 163 +++++++++++++++++++++++++++++
cmake-desktop_icon.patch | 14 +++
cmake-findruby.patch | 20 ++++
cmake-ninja.patch | 23 ++++
cmake-strict_aliasing.patch | 19 ++++
cmake28.patch | 157 +++++++++++++---------------
cmake28.spec | 40 +++++++-
sources | 2 +-
11 files changed, 465 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cec9ac4..b4a57aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/cmake-2.8.8.tar.gz
/cmake-2.8.9.tar.gz
/cmake-2.8.10.tar.gz
+/cmake-2.8.11.2.tar.gz
diff --git a/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch b/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
new file mode 100644
index 0000000..9afa51a
--- /dev/null
+++ b/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
@@ -0,0 +1,38 @@
+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/cmake-2.8.11-rc4-lua-5.2.patch b/cmake-2.8.11-rc4-lua-5.2.patch
new file mode 100644
index 0000000..d900450
--- /dev/null
+++ b/cmake-2.8.11-rc4-lua-5.2.patch
@@ -0,0 +1,77 @@
+diff -up cmake-2.8.11-rc4/Modules/FindLua52.cmake.lua-52 cmake-2.8.11-rc4/Modules/FindLua52.cmake
+--- cmake-2.8.11-rc4/Modules/FindLua52.cmake.lua-52 2013-05-13 09:41:15.221278404 -0400
++++ cmake-2.8.11-rc4/Modules/FindLua52.cmake 2013-05-13 09:03:43.422233385 -0400
+@@ -0,0 +1,73 @@
++# Locate Lua library
++# This module defines
++# LUA52_FOUND, if false, do not try to link to Lua
++# LUA_LIBRARIES
++# LUA_INCLUDE_DIR, where to find lua.h
++# LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
++#
++# Note that the expected include convention is
++# #include "lua.h"
++# and not
++# #include <lua/lua.h>
++# This is because, the lua location is not standardized and may exist
++# in locations other than lua/
++
++#=============================================================================
++# Copyright 2007-2009 Kitware, Inc.
++#
++# Distributed under the OSI-approved BSD License (the "License");
++# see accompanying file Copyright.txt for details.
++#
++# This software is distributed WITHOUT ANY WARRANTY; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++# See the License for more information.
++#=============================================================================
++# (To distribute this file outside of CMake, substitute the full
++# License text for the above reference.)
++
++find_path(LUA_INCLUDE_DIR lua.h
++ HINTS
++ ENV LUA_DIR
++ PATH_SUFFIXES include/lua52 include/lua5.2 include/lua-5.2 include/lua include
++ PATHS
++ ~/Library/Frameworks
++ /Library/Frameworks
++ /sw # Fink
++ /opt/local # DarwinPorts
++ /opt/csw # Blastwave
++ /opt
++)
++
++find_library(LUA_LIBRARY
++ NAMES lua52 lua5.2 lua-5.2 lua
++ HINTS
++ ENV LUA_DIR
++ PATH_SUFFIXES lib
++ PATHS
++ ~/Library/Frameworks
++ /Library/Frameworks
++ /sw
++ /opt/local
++ /opt/csw
++ /opt
++)
++
++if(LUA_LIBRARY)
++ # include the math library for Unix
++ if(UNIX AND NOT APPLE AND NOT BEOS)
++ find_library(LUA_MATH_LIBRARY m)
++ set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
++ # For Windows and Mac, don't need to explicitly include the math library
++ else()
++ set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
++ endif()
++endif()
++
++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
++# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
++# all listed variables are TRUE
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua52
++ REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR)
++
++mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
++
diff --git a/cmake-FindPostgreSQL.patch b/cmake-FindPostgreSQL.patch
new file mode 100644
index 0000000..419b612
--- /dev/null
+++ b/cmake-FindPostgreSQL.patch
@@ -0,0 +1,163 @@
+diff -up cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake
+--- cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql 2012-10-24 11:12:01.000000000 -0600
++++ cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake 2012-10-24 19:49:54.189433358 -0600
+@@ -92,77 +92,99 @@ set( PostgreSQL_ROOT_DIRECTORIES
+ #
+ # Look for an installation.
+ #
+-find_path(PostgreSQL_INCLUDE_DIR
+- NAMES libpq-fe.h
++find_path(PostgreSQL_CONFIG_DIR
++ NAMES pg_config
+ PATHS
+ # Look in other places.
+ ${PostgreSQL_ROOT_DIRECTORIES}
+ PATH_SUFFIXES
+- pgsql
+- postgresql
+- include
++ ""
++ bin
+ # Help the user find it if we cannot.
+- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
++ DOC "The ${PostgreSQL_ROOT_DIR_MESSAGE}"
+ )
+
+-find_path(PostgreSQL_TYPE_INCLUDE_DIR
+- NAMES catalog/pg_type.h
+- PATHS
+- # Look in other places.
+- ${PostgreSQL_ROOT_DIRECTORIES}
+- PATH_SUFFIXES
+- postgresql
+- pgsql/server
+- postgresql/server
+- include/server
+- # Help the user find it if we cannot.
+- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
+-)
+-
+-# The PostgreSQL library.
+-set (PostgreSQL_LIBRARY_TO_FIND pq)
+-# Setting some more prefixes for the library
+-set (PostgreSQL_LIB_PREFIX "")
+-if ( WIN32 )
+- set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib")
+- set ( PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
+-endif()
++macro (fail_if)
++ if (${ARGV})
++ message (WARNING "Couldn't determine PostgreSQL configuration.")
++ unset (PostgreSQL_CONFIG_DIR)
++ break ()
++ endif ()
++endmacro ()
++
++macro (run_pg_config arg var)
++ execute_process(COMMAND ${PostgreSQL_CONFIG_DIR}/pg_config ${arg}
++ RESULT_VARIABLE pgsql_config_result
++ OUTPUT_VARIABLE ${var}
++ OUTPUT_STRIP_TRAILING_WHITESPACE)
++
++ fail_if (NOT ${pgsql_config_result} EQUAL 0 OR NOT ${var})
++endmacro ()
++
++foreach (once only)
++ fail_if (NOT PostgreSQL_CONFIG_DIR)
++
++ run_pg_config (--version PostgreSQL_VERSION_STRING)
++ string (REGEX REPLACE "^PostgreSQL (.*)$" "\\1"
++ PostgreSQL_VERSION_STRING "${PostgreSQL_VERSION_STRING}")
++ fail_if (NOT PostgreSQL_VERSION_STRING)
++
++ run_pg_config (--includedir PostgreSQL_INCLUDE_DIR)
++ fail_if (NOT EXISTS "${PostgreSQL_INCLUDE_DIR}/libpq-fe.h")
++
++ find_path(PostgreSQL_TYPE_INCLUDE_DIR
++ NAMES catalog/pg_type.h
++ PATHS ${PostgreSQL_INCLUDE_DIR}
++ PATH_SUFFIXES
++ pgsql/server
++ postgresql/server
++ include/server
++ # Help the user find it if we cannot.
++ DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
++ )
++ fail_if (NOT PostgreSQL_TYPE_INCLUDE_DIR)
++
++ set (PostgreSQL_INCLUDE_DIRS
++ ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR})
++
++ run_pg_config (--libdir PostgreSQL_LIBRARY_DIRS)
++
++ # The PostgreSQL library.
++ set (PostgreSQL_LIBRARY_TO_FIND pq)
++ # Setting some more prefixes for the library
++ set (PostgreSQL_LIB_PREFIX "")
++ if (WIN32)
++ set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib")
++ set (PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
++ endif()
++
++ find_library (PostgreSQL_LIBRARY
++ NAMES ${PostgreSQL_LIBRARY_TO_FIND}
++ PATHS ${PostgreSQL_LIBRARY_DIRS}
++ PATH_SUFFIXES lib
++ )
++ fail_if (NOT PostgreSQL_LIBRARY)
++ set (PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
+
+-find_library( PostgreSQL_LIBRARY
+- NAMES ${PostgreSQL_LIBRARY_TO_FIND}
+- PATHS
+- ${PostgreSQL_ROOT_DIRECTORIES}
+- PATH_SUFFIXES
+- lib
+-)
+-get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH)
+-
+-if (PostgreSQL_INCLUDE_DIR AND EXISTS "${PostgreSQL_INCLUDE_DIR}/pg_config.h")
+- file(STRINGS "${PostgreSQL_INCLUDE_DIR}/pg_config.h" pgsql_version_str
+- REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"")
+-
+- string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" "\\1"
+- PostgreSQL_VERSION_STRING "${pgsql_version_str}")
+- unset(pgsql_version_str)
+-endif()
++endforeach()
+
+ # Did we find anything?
+-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+-find_package_handle_standard_args(PostgreSQL
+- REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR
+- VERSION_VAR PostgreSQL_VERSION_STRING)
+-set( PostgreSQL_FOUND ${POSTGRESQL_FOUND})
++include (FindPackageHandleStandardArgs)
++find_package_handle_standard_args (PostgreSQL
++ REQUIRED_VARS
++ PostgreSQL_LIBRARY_DIRS
++ PostgreSQL_CONFIG_DIR
++ PostgreSQL_INCLUDE_DIRS
++ PostgreSQL_LIBRARIES
++ VERSION_VAR
++ PostgreSQL_VERSION_STRING
++)
++set (PostgreSQL_FOUND ${POSTGRESQL_FOUND})
+
+ # Now try to get the include and library path.
+-if(PostgreSQL_FOUND)
+-
+- set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} )
+- set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} )
+- set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
+-
+- #message("Final PostgreSQL include dir: ${PostgreSQL_INCLUDE_DIRS}")
+- #message("Final PostgreSQL library dir: ${PostgreSQL_LIBRARY_DIRS}")
+- #message("Final PostgreSQL libraries: ${PostgreSQL_LIBRARIES}")
++if (PostgreSQL_FOUND)
++ message (STATUS "PostgreSQL include dirs: ${PostgreSQL_INCLUDE_DIRS}")
++ message (STATUS "PostgreSQL library dirs: ${PostgreSQL_LIBRARY_DIRS}")
++ message (STATUS "PostgreSQL libraries: ${PostgreSQL_LIBRARIES}")
+ endif()
+
+-mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR PostgreSQL_LIBRARY )
diff --git a/cmake-desktop_icon.patch b/cmake-desktop_icon.patch
new file mode 100644
index 0000000..89f202c
--- /dev/null
+++ b/cmake-desktop_icon.patch
@@ -0,0 +1,14 @@
+diff -up cmake-2.8.10.1/Source/QtDialog/CMake.desktop\~ cmake-2.8.10.1/Source/QtDialog/CMake.desktop
+--- cmake-2.8.10.1/Source/QtDialog/CMake.desktop~ 2012-11-06 20:41:36.000000000 +0100
++++ cmake-2.8.10.1/Source/QtDialog/CMake.desktop 2012-12-06 01:02:51.054110499 +0100
+@@ -3,7 +3,7 @@ Version=1.0
+ Name=CMake
+ Comment=Cross-platform buildsystem
+ Exec=cmake-gui %f
+-Icon=CMakeSetup32.png
++Icon=CMakeSetup32
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+
+Diff finished. Thu Dec 6 01:03:01 2012
diff --git a/cmake-findruby.patch b/cmake-findruby.patch
new file mode 100644
index 0000000..6c60931
--- /dev/null
+++ b/cmake-findruby.patch
@@ -0,0 +1,20 @@
+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
+ _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
+ _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+
+- # vendor_ruby available ?
+- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
+- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
+-
+- if(RUBY_HAS_VENDOR_RUBY)
+- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
+- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+- endif()
++ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
++ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+
+ # save the results in the cache so we don't have to run ruby the next time again
+ set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
diff --git a/cmake-ninja.patch b/cmake-ninja.patch
new file mode 100644
index 0000000..1ea3017
--- /dev/null
+++ b/cmake-ninja.patch
@@ -0,0 +1,23 @@
+diff -up cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake
+--- cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja 2012-11-27 06:26:32.000000000 -0700
++++ cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake 2013-02-08 09:30:26.437739370 -0700
+@@ -12,6 +12,6 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
+-find_program(CMAKE_MAKE_PROGRAM ninja
++find_program(CMAKE_MAKE_PROGRAM ninja-build
+ DOC "Program used to build from build.ninja files.")
+ mark_as_advanced(CMAKE_MAKE_PROGRAM)
+diff -up cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx
+--- cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja 2012-11-27 06:26:33.000000000 -0700
++++ cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx 2013-02-08 09:32:30.397949661 -0700
+@@ -1034,7 +1034,7 @@ std::string cmGlobalNinjaGenerator::ninj
+ lgen->GetMakefile()->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"),
+ cmLocalGenerator::SHELL);
+ }
+- return "ninja";
++ return "ninja-build";
+ }
+
+ void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os)
diff --git a/cmake-strict_aliasing.patch b/cmake-strict_aliasing.patch
new file mode 100644
index 0000000..2bc1555
--- /dev/null
+++ b/cmake-strict_aliasing.patch
@@ -0,0 +1,19 @@
+diff -up cmake-2.8.11/Source/CMakeLists.txt\~ cmake-2.8.11/Source/CMakeLists.txt
+--- cmake-2.8.11/Source/CMakeLists.txt~ 2013-05-15 19:38:13.000000000 +0200
++++ cmake-2.8.11/Source/CMakeLists.txt 2013-07-25 16:35:01.200389140 +0200
+@@ -308,6 +308,13 @@ if(APPLE)
+ cmLocalXCodeGenerator.h)
+ endif()
+
++# GCC shows strict aliasing warnings with cm_sha2.c. Turn off the
++# corresponding optimizations.
++if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
++ set_source_files_properties(cm_sha2.c PROPERTIES
++ COMPILE_FLAGS "-fno-strict-aliasing")
++endif()
++
+
+ if (WIN32)
+ set(SRCS ${SRCS}
+
+Diff finished. Thu Jul 25 16:35:18 2013
diff --git a/cmake28.patch b/cmake28.patch
index a806f8c..670b487 100644
--- a/cmake28.patch
+++ b/cmake28.patch
@@ -1,7 +1,7 @@
-diff -up cmake-2.8.10/bootstrap.cmake28 cmake-2.8.10/bootstrap
---- cmake-2.8.10/bootstrap.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/bootstrap 2013-03-04 16:09:05.238910648 +0000
-@@ -1454,8 +1454,8 @@ cmake_c_flags="${cmake_c_flags}-I`cmake_
+diff -Naur cmake-2.8.11.2.orig/bootstrap cmake-2.8.11.2/bootstrap
+--- cmake-2.8.11.2.orig/bootstrap 2013-07-02 08:41:41.000000000 -0500
++++ cmake-2.8.11.2/bootstrap 2013-07-26 15:52:58.781658392 -0500
+@@ -1471,8 +1471,8 @@
-I`cmake_escape \"${cmake_bootstrap_dir}\"`"
cmake_cxx_flags="${cmake_cxx_flags} -I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \
-I`cmake_escape \"${cmake_bootstrap_dir}\"`"
@@ -12,7 +12,7 @@ diff -up cmake-2.8.10/bootstrap.cmake28 cmake-2.8.10/bootstrap
for a in ${CMAKE_CXX_SOURCES}; do
src=`cmake_escape "${cmake_source_dir}/Source/${a}.cxx"`
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
-@@ -1569,7 +1569,7 @@ cmake_options="-DCMAKE_BOOTSTRAP=1"
+@@ -1572,7 +1572,7 @@
if [ -n "${cmake_verbose}" ]; then
cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
fi
@@ -21,10 +21,10 @@ diff -up cmake-2.8.10/bootstrap.cmake28 cmake-2.8.10/bootstrap
RES=$?
if [ "${RES}" -ne "0" ]; then
cmake_error 11 "Problem while running initial CMake"
-diff -up cmake-2.8.10/CMakeLists.txt.cmake28 cmake-2.8.10/CMakeLists.txt
---- cmake-2.8.10/CMakeLists.txt.cmake28 2012-10-31 15:32:05.000000000 +0000
-+++ cmake-2.8.10/CMakeLists.txt 2013-03-04 16:12:59.432968824 +0000
-@@ -150,9 +150,9 @@ macro(CMAKE_SETUP_TESTING)
+diff -Naur cmake-2.8.11.2.orig/CMakeLists.txt cmake-2.8.11.2/CMakeLists.txt
+--- cmake-2.8.11.2.orig/CMakeLists.txt 2013-07-02 08:41:39.000000000 -0500
++++ cmake-2.8.11.2/CMakeLists.txt 2013-07-26 15:52:58.783658350 -0500
+@@ -152,9 +152,9 @@
# the ctest from this cmake is used for testing
# and not the ctest from the cmake building and testing
# cmake.
@@ -37,19 +37,19 @@ diff -up cmake-2.8.10/CMakeLists.txt.cmake28 cmake-2.8.10/CMakeLists.txt
endif()
# configure some files for testing
-diff -up cmake-2.8.10/Source/cmake.cxx.cmake28 cmake-2.8.10/Source/cmake.cxx
---- cmake-2.8.10/Source/cmake.cxx.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Source/cmake.cxx 2013-03-04 16:09:05.241910501 +0000
-@@ -954,7 +954,7 @@ int cmake::AddCMakePaths()
+diff -Naur cmake-2.8.11.2.orig/Source/cmake.cxx cmake-2.8.11.2/Source/cmake.cxx
+--- cmake-2.8.11.2.orig/Source/cmake.cxx 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Source/cmake.cxx 2013-07-26 15:52:58.786658287 -0500
+@@ -975,7 +975,7 @@
// Find the cmake executable
std::string cMakeSelf = cmSystemTools::GetExecutableDirectory();
cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str());
- cMakeSelf += "/cmake";
+ cMakeSelf += "/cmake28";
cMakeSelf += cmSystemTools::GetExecutableExtension();
- #if __APPLE__
+ #ifdef __APPLE__
// on the apple this might be the gui bundle
-@@ -999,12 +999,12 @@ int cmake::AddCMakePaths()
+@@ -1020,12 +1020,12 @@
if( !cmSystemTools::FileExists(editCacheCommand.c_str()))
{
editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -64,7 +64,7 @@ diff -up cmake-2.8.10/Source/cmake.cxx.cmake28 cmake-2.8.10/Source/cmake.cxx
}
if(cmSystemTools::FileExists(editCacheCommand.c_str()))
{
-@@ -1014,7 +1014,7 @@ int cmake::AddCMakePaths()
+@@ -1035,7 +1035,7 @@
}
}
std::string ctestCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -73,7 +73,7 @@ diff -up cmake-2.8.10/Source/cmake.cxx.cmake28 cmake-2.8.10/Source/cmake.cxx
if(cmSystemTools::FileExists(ctestCommand.c_str()))
{
this->CacheManager->AddCacheEntry
-@@ -1022,7 +1022,7 @@ int cmake::AddCMakePaths()
+@@ -1043,7 +1043,7 @@
"Path to ctest program executable.", cmCacheManager::INTERNAL);
}
std::string cpackCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -82,7 +82,7 @@ diff -up cmake-2.8.10/Source/cmake.cxx.cmake28 cmake-2.8.10/Source/cmake.cxx
if(cmSystemTools::FileExists(cpackCommand.c_str()))
{
this->CacheManager->AddCacheEntry
-@@ -3039,7 +3039,7 @@ const char* cmake::GetCTestCommand()
+@@ -3101,7 +3101,7 @@
{
if ( this->CTestCommand.empty() )
{
@@ -91,7 +91,7 @@ diff -up cmake-2.8.10/Source/cmake.cxx.cmake28 cmake-2.8.10/Source/cmake.cxx
}
if ( this->CTestCommand.empty() )
{
-@@ -3053,7 +3053,7 @@ const char* cmake::GetCPackCommand()
+@@ -3115,7 +3115,7 @@
{
if ( this->CPackCommand.empty() )
{
@@ -100,10 +100,10 @@ diff -up cmake-2.8.10/Source/cmake.cxx.cmake28 cmake-2.8.10/Source/cmake.cxx
}
if ( this->CPackCommand.empty() )
{
-diff -up cmake-2.8.10/Source/CMakeLists.txt.cmake28 cmake-2.8.10/Source/CMakeLists.txt
---- cmake-2.8.10/Source/CMakeLists.txt.cmake28 2012-10-31 15:32:05.000000000 +0000
-+++ cmake-2.8.10/Source/CMakeLists.txt 2013-03-04 16:16:21.395968820 +0000
-@@ -533,8 +533,8 @@ if(APPLE)
+diff -Naur cmake-2.8.11.2.orig/Source/CMakeLists.txt cmake-2.8.11.2/Source/CMakeLists.txt
+--- cmake-2.8.11.2.orig/Source/CMakeLists.txt 2013-07-26 15:52:34.221174997 -0500
++++ cmake-2.8.11.2/Source/CMakeLists.txt 2013-07-26 15:52:58.788658245 -0500
+@@ -543,8 +543,8 @@
endif()
# Build CMake executable
@@ -114,7 +114,7 @@ diff -up cmake-2.8.10/Source/CMakeLists.txt.cmake28 cmake-2.8.10/Source/CMakeLis
# Build special executable for running programs on Windows 98
if(WIN32)
-@@ -546,12 +546,12 @@ if(WIN32)
+@@ -556,12 +556,12 @@
endif()
# Build CTest executable
@@ -131,7 +131,7 @@ diff -up cmake-2.8.10/Source/CMakeLists.txt.cmake28 cmake-2.8.10/Source/CMakeLis
# Curses GUI
if(BUILD_CursesDialog)
-@@ -567,9 +567,9 @@ endif()
+@@ -577,9 +577,9 @@
include (${CMake_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
include (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
@@ -144,10 +144,10 @@ diff -up cmake-2.8.10/Source/CMakeLists.txt.cmake28 cmake-2.8.10/Source/CMakeLis
if(APPLE)
install_targets(/bin cmakexbuild)
endif()
-diff -up cmake-2.8.10/Source/cmCTest.cxx.cmake28 cmake-2.8.10/Source/cmCTest.cxx
---- cmake-2.8.10/Source/cmCTest.cxx.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Source/cmCTest.cxx 2013-03-04 16:09:05.244910823 +0000
-@@ -2486,7 +2486,7 @@ void cmCTest::FindRunningCMake()
+diff -Naur cmake-2.8.11.2.orig/Source/cmCTest.cxx cmake-2.8.11.2/Source/cmCTest.cxx
+--- cmake-2.8.11.2.orig/Source/cmCTest.cxx 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Source/cmCTest.cxx 2013-07-26 15:52:58.790658203 -0500
+@@ -2489,7 +2489,7 @@
{
// Find our own executable.
this->CTestSelf = cmSystemTools::GetExecutableDirectory();
@@ -156,7 +156,7 @@ diff -up cmake-2.8.10/Source/cmCTest.cxx.cmake28 cmake-2.8.10/Source/cmCTest.cxx
this->CTestSelf += cmSystemTools::GetExecutableExtension();
if(!cmSystemTools::FileExists(this->CTestSelf.c_str()))
{
-@@ -2495,7 +2495,7 @@ void cmCTest::FindRunningCMake()
+@@ -2498,7 +2498,7 @@
}
this->CMakeSelf = cmSystemTools::GetExecutableDirectory();
@@ -165,10 +165,10 @@ diff -up cmake-2.8.10/Source/cmCTest.cxx.cmake28 cmake-2.8.10/Source/cmCTest.cxx
this->CMakeSelf += cmSystemTools::GetExecutableExtension();
if(!cmSystemTools::FileExists(this->CMakeSelf.c_str()))
{
-diff -up cmake-2.8.10/Source/cmGlobalGenerator.cxx.cmake28 cmake-2.8.10/Source/cmGlobalGenerator.cxx
---- cmake-2.8.10/Source/cmGlobalGenerator.cxx.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Source/cmGlobalGenerator.cxx 2013-03-04 16:09:05.246938773 +0000
-@@ -1974,7 +1974,7 @@ void cmGlobalGenerator::CreateDefaultGlo
+diff -Naur cmake-2.8.11.2.orig/Source/cmGlobalGenerator.cxx cmake-2.8.11.2/Source/cmGlobalGenerator.cxx
+--- cmake-2.8.11.2.orig/Source/cmGlobalGenerator.cxx 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Source/cmGlobalGenerator.cxx 2013-07-26 15:52:58.792658161 -0500
+@@ -1998,7 +1998,7 @@
// We are building CMake itself. We cannot use the original
// executable to install over itself. The generator will
// automatically convert this name to the build-time location.
@@ -177,10 +177,10 @@ diff -up cmake-2.8.10/Source/cmGlobalGenerator.cxx.cmake28 cmake-2.8.10/Source/c
}
singleLine.push_back(cmd.c_str());
if ( cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.' )
-diff -up cmake-2.8.10/Source/CursesDialog/CMakeLists.txt.cmake28 cmake-2.8.10/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.10/Source/CursesDialog/CMakeLists.txt.cmake28 2012-10-31 15:32:05.000000000 +0000
-+++ cmake-2.8.10/Source/CursesDialog/CMakeLists.txt 2013-03-04 16:18:08.652938120 +0000
-@@ -30,8 +30,8 @@ include_directories(${CMake_SOURCE_DIR}/
+diff -Naur cmake-2.8.11.2.orig/Source/CursesDialog/CMakeLists.txt cmake-2.8.11.2/Source/CursesDialog/CMakeLists.txt
+--- cmake-2.8.11.2.orig/Source/CursesDialog/CMakeLists.txt 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Source/CursesDialog/CMakeLists.txt 2013-07-26 15:52:58.793658140 -0500
+@@ -30,8 +30,8 @@
include_directories(${CURSES_INCLUDE_PATH})
@@ -193,9 +193,9 @@ diff -up cmake-2.8.10/Source/CursesDialog/CMakeLists.txt.cmake28 cmake-2.8.10/So
-install_targets(/bin ccmake)
+install_targets(/bin ccmake28)
-diff -up cmake-2.8.10/Source/QtDialog/CMake.desktop.cmake28 cmake-2.8.10/Source/QtDialog/CMake.desktop
---- cmake-2.8.10/Source/QtDialog/CMake.desktop.cmake28 2012-10-31 15:32:05.000000000 +0000
-+++ cmake-2.8.10/Source/QtDialog/CMake.desktop 2013-03-04 16:09:05.247937747 +0000
+diff -Naur cmake-2.8.11.2.orig/Source/QtDialog/CMake.desktop cmake-2.8.11.2/Source/QtDialog/CMake.desktop
+--- cmake-2.8.11.2.orig/Source/QtDialog/CMake.desktop 2013-07-26 15:52:34.225174913 -0500
++++ cmake-2.8.11.2/Source/QtDialog/CMake.desktop 2013-07-26 15:55:09.970899946 -0500
@@ -1,9 +1,9 @@
[Desktop Entry]
Version=1.0
@@ -203,16 +203,16 @@ diff -up cmake-2.8.10/Source/QtDialog/CMake.desktop.cmake28 cmake-2.8.10/Source/
+Name=CMake28
Comment=Cross-platform buildsystem
-Exec=cmake-gui %f
--Icon=CMakeSetup32.png
+-Icon=CMakeSetup32
+Exec=cmake28-gui %f
-+Icon=CMake28Setup32.png
++Icon=CMake28Setup32
Terminal=false
X-MultipleArgs=false
Type=Application
-diff -up cmake-2.8.10/Source/QtDialog/CMakeLists.txt.cmake28 cmake-2.8.10/Source/QtDialog/CMakeLists.txt
---- cmake-2.8.10/Source/QtDialog/CMakeLists.txt.cmake28 2012-10-31 15:32:05.000000000 +0000
-+++ cmake-2.8.10/Source/QtDialog/CMakeLists.txt 2013-03-04 16:22:07.111938950 +0000
-@@ -87,8 +87,8 @@ endif()
+diff -Naur cmake-2.8.11.2.orig/Source/QtDialog/CMakeLists.txt cmake-2.8.11.2/Source/QtDialog/CMakeLists.txt
+--- cmake-2.8.11.2.orig/Source/QtDialog/CMakeLists.txt 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Source/QtDialog/CMakeLists.txt 2013-07-26 15:52:58.793658140 -0500
+@@ -89,8 +89,8 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -223,7 +223,7 @@ diff -up cmake-2.8.10/Source/QtDialog/CMakeLists.txt.cmake28 cmake-2.8.10/Source
if(APPLE)
set_target_properties(cmake-gui PROPERTIES
-@@ -97,14 +97,14 @@ endif()
+@@ -99,14 +99,14 @@
set(CMAKE_INSTALL_DESTINATION_ARGS
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
@@ -242,10 +242,10 @@ diff -up cmake-2.8.10/Source/QtDialog/CMakeLists.txt.cmake28 cmake-2.8.10/Source
endif()
if(APPLE)
-diff -up cmake-2.8.10/Tests/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/CMakeLists.txt
---- cmake-2.8.10/Tests/CMakeLists.txt.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Tests/CMakeLists.txt 2013-03-04 16:09:05.250936537 +0000
-@@ -1759,9 +1759,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+diff -Naur cmake-2.8.11.2.orig/Tests/CMakeLists.txt cmake-2.8.11.2/Tests/CMakeLists.txt
+--- cmake-2.8.11.2.orig/Tests/CMakeLists.txt 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Tests/CMakeLists.txt 2013-07-26 15:52:58.794658119 -0500
+@@ -1831,9 +1831,9 @@
file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA"
DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCoverage")
add_test(NAME CTestGTMCoverage
@@ -257,7 +257,7 @@ diff -up cmake-2.8.10/Tests/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/CMakeLists
set_tests_properties(CTestGTMCoverage PROPERTIES
PASS_REGULAR_EXPRESSION
"Process file.*XINDEX.m.*Total LOC:.*127.*Percentage Coverage: 85.83.*"
-@@ -1776,9 +1776,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+@@ -1848,9 +1848,9 @@
file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA"
DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage")
add_test(NAME CTestCacheCoverage
@@ -269,7 +269,7 @@ diff -up cmake-2.8.10/Tests/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/CMakeLists
set_tests_properties(CTestCacheCoverage PROPERTIES
PASS_REGULAR_EXPRESSION
"Process file.*XINDEX.m.*Total LOC:.*125.*Percentage Coverage: 85.60.*"
-@@ -2138,7 +2138,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+@@ -2216,7 +2216,7 @@
--build-makeprogram ${bootstrap}
--build-generator "${CMAKE_TEST_GENERATOR}"
--test-command
@@ -278,31 +278,19 @@ diff -up cmake-2.8.10/Tests/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/CMakeLists
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest")
# Make this test run early during parallel execution
set_tests_properties(BootstrapTest PROPERTIES COST 5000)
-diff -up cmake-2.8.10/Tests/CMakeTests/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/CMakeTests/CMakeLists.txt
---- cmake-2.8.10/Tests/CMakeTests/CMakeLists.txt.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Tests/CMakeTests/CMakeLists.txt 2013-03-04 16:23:44.472969157 +0000
+diff -Naur cmake-2.8.11.2.orig/Tests/CMakeTests/CMakeLists.txt cmake-2.8.11.2/Tests/CMakeTests/CMakeLists.txt
+--- cmake-2.8.11.2.orig/Tests/CMakeTests/CMakeLists.txt 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Tests/CMakeTests/CMakeLists.txt 2013-07-26 15:52:58.794658119 -0500
@@ -1,4 +1,4 @@
-set(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake")
+set(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake28")
macro(AddCMakeTest TestName PreArgs)
-diff -up cmake-2.8.10/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 cmake-2.8.10/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
---- cmake-2.8.10/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake 2013-03-04 16:09:05.251938353 +0000
-@@ -10,7 +10,7 @@ if(NOT CPackGen)
- message(FATAL_ERROR "CPackGen not set")
- endif()
- get_filename_component(CPACK_LOCATION ${CMAKE_COMMAND} PATH)
--set(CPackCommand "${CPACK_LOCATION}/cpack")
-+set(CPackCommand "${CPACK_LOCATION}/cpack28")
- message("cpack = ${CPackCommand}")
- if(NOT CPackCommand)
- message(FATAL_ERROR "CPackCommand not set")
-diff -up cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in.cmake28 cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in
---- cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in 2013-03-04 16:09:05.251938353 +0000
-@@ -5,7 +5,7 @@ set(CTEST_BINARY_DIRECTORY "@CMake_BINAR
+diff -Naur cmake-2.8.11.2.orig/Tests/CTestConfig/dashboard.cmake.in cmake-2.8.11.2/Tests/CTestConfig/dashboard.cmake.in
+--- cmake-2.8.11.2.orig/Tests/CTestConfig/dashboard.cmake.in 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Tests/CTestConfig/dashboard.cmake.in 2013-07-26 15:52:58.794658119 -0500
+@@ -5,7 +5,7 @@
file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
get_filename_component(dir "${CMAKE_COMMAND}" PATH)
@@ -311,10 +299,10 @@ diff -up cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in.cmake28 cmake-2.8.10/
message("CMAKE_COMMAND='${CMAKE_COMMAND}'")
message("CMAKE_CTEST_COMMAND='${CMAKE_CTEST_COMMAND}'")
-diff -up cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt
---- cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt 2013-03-04 16:09:05.252938309 +0000
-@@ -19,7 +19,7 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCH
+diff -Naur cmake-2.8.11.2.orig/Tests/FindPackageModeMakefileTest/CMakeLists.txt cmake-2.8.11.2/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+--- cmake-2.8.11.2.orig/Tests/FindPackageModeMakefileTest/CMakeLists.txt 2013-07-02 08:41:40.000000000 -0500
++++ cmake-2.8.11.2/Tests/FindPackageModeMakefileTest/CMakeLists.txt 2013-07-26 15:52:58.795658098 -0500
+@@ -19,7 +19,7 @@
configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake @ONLY)
# now set up the test:
@@ -323,10 +311,10 @@ diff -up cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 c
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in ${CMAKE_CURRENT_BINARY_DIR}/ConfMakefile @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_BINARY_DIR}/main.cpp COPYONLY)
-diff -up cmake-2.8.10/Utilities/CMakeLists.txt.cmake28 cmake-2.8.10/Utilities/CMakeLists.txt
---- cmake-2.8.10/Utilities/CMakeLists.txt.cmake28 2012-10-31 15:32:06.000000000 +0000
-+++ cmake-2.8.10/Utilities/CMakeLists.txt 2013-03-04 16:28:02.178909699 +0000
-@@ -17,34 +17,34 @@ make_directory(${CMake_BINARY_DIR}/Docs)
+diff -Naur cmake-2.8.11.2.orig/Utilities/CMakeLists.txt cmake-2.8.11.2/Utilities/CMakeLists.txt
+--- cmake-2.8.11.2.orig/Utilities/CMakeLists.txt 2013-07-02 08:41:41.000000000 -0500
++++ cmake-2.8.11.2/Utilities/CMakeLists.txt 2013-07-26 15:52:58.795658098 -0500
+@@ -17,34 +17,34 @@
set(DOC_FILES "")
set(MAN_FILES
@@ -383,7 +371,7 @@ diff -up cmake-2.8.10/Utilities/CMakeLists.txt.cmake28 cmake-2.8.10/Utilities/CM
)
macro(ADD_DOCS target dependency)
-@@ -84,42 +84,42 @@ if(BUILD_QtDialog AND "${CMAKE_GENERATOR
+@@ -84,42 +84,42 @@
endif()
# add the docs for the executables
@@ -406,7 +394,7 @@ diff -up cmake-2.8.10/Utilities/CMakeLists.txt.cmake28 cmake-2.8.10/Utilities/CM
- OUTPUT ${CMake_BINARY_DIR}/Docs/cmake.txt
+ OUTPUT ${CMake_BINARY_DIR}/Docs/cmake28.txt
COMMAND ${CMD}
-- ARGS --copyright ${CMake_BINARY_DIR}/Docs/Copyright.txt
+ ARGS --copyright ${CMake_BINARY_DIR}/Docs/Copyright.txt
- --help-full ${CMake_BINARY_DIR}/Docs/cmake.txt
- --help-full ${CMake_BINARY_DIR}/Docs/cmake.html
- --help-full ${CMake_BINARY_DIR}/Docs/cmake.1
@@ -430,7 +418,6 @@ diff -up cmake-2.8.10/Utilities/CMakeLists.txt.cmake28 cmake-2.8.10/Utilities/CM
- --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html
- --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmakecompat.1
- DEPENDS cmake
-+ ARGS --copyright ${CMake_BINARY_DIR}/Docs/Copyright.txt
+ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.txt
+ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.html
+ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.1
@@ -457,7 +444,7 @@ diff -up cmake-2.8.10/Utilities/CMakeLists.txt.cmake28 cmake-2.8.10/Utilities/CM
MAIN_DEPENDENCY ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt
)
-@@ -129,10 +129,10 @@ install_files(${CMAKE_DOC_DIR} FILES
+@@ -129,10 +129,10 @@
${HTML_FILES}
${DOCBOOK_FILES}
)
diff --git a/cmake28.spec b/cmake28.spec
index 90ba423..0601e78 100644
--- a/cmake28.spec
+++ b/cmake28.spec
@@ -7,7 +7,7 @@
%define rcver %{nil}
Name: cmake28
-Version: 2.8.10
+Version: 2.8.11.2
Release: 1%{?dist}
Summary: Cross-platform make system
@@ -23,8 +23,31 @@ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
Source2: macros.cmake28
# Patch to find DCMTK in Fedora (bug #720140)
Patch0: cmake-dcmtk.patch
+# Patch to use ninja-build instead of ninja (renamed in Fedora)
+# https://bugzilla.redhat.com/show_bug.cgi?id=886184
+Patch1: cmake-ninja.patch
+# Patch to fix RindRuby vendor settings
+# http://public.kitware.com/Bug/view.php?id=12965
+# https://bugzilla.redhat.com/show_bug.cgi?id=822796
+Patch2: cmake-findruby.patch
+# Patch to fix FindPostgreSQL
+# https://bugzilla.redhat.com/show_bug.cgi?id=828467
+# http://public.kitware.com/Bug/view.php?id=13378
+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
+# Add FindLua52.cmake
+Patch5: cmake-2.8.11-rc4-lua-5.2.patch
+# Add -fno-strict-aliasing when compiling cm_sha2.c
+# http://www.cmake.org/Bug/view.php?id=14314
+Patch6: cmake-strict_aliasing.patch
+# Patch away .png extension in icon name in desktop file.
+# http://www.cmake.org/Bug/view.php?id=14315
+Patch7: cmake-desktop_icon.patch
+
# This patch renames the executables with a "28" suffix
-Patch1: cmake28.patch
+Patch8: cmake28.patch
# Source/kwsys/MD5.c
# see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries
@@ -70,7 +93,14 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%prep
%setup -q -n cmake-%{version}%{?rcver}
%patch0 -p1 -b .dcmtk
-%patch1 -p1 -b .cmake28
+%patch1 -p1 -b .ninja
+%patch2 -p1 -b .ruby
+%patch3 -p1 -b .psql
+%patch4 -p1 -b .pkgconf
+%patch5 -p1 -b .lua
+%patch6 -p1 -b .strict-aa
+%patch7 -p1 -b .desktop_icon
+%patch8 -p1 -b .cmake28
%build
@@ -166,6 +196,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Fri Jul 26 2013 Richard Shaw <hobbes1069 at gmail.com> - 2.8.11.2-1
+- Update to latest upstream release.
+- Fixed warning in desktop file due to icon file with extension.
+
* Mon Mar 4 2013 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.8.10-1
- Update to version 2.8.10 and rebase cmake28 patch
diff --git a/sources b/sources
index eae2cd3..a43fced 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4aef1eab859df61d2664721a72732c0 cmake-2.8.10.tar.gz
+6f5d7b8e7534a5d9e1a7664ba63cf882 cmake-2.8.11.2.tar.gz
More information about the scm-commits
mailing list