From fb6f0e58a55c22dfe2fda5ae3cb4a6fd9fd0aceb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Jul 2011 16:42:10 -0600 Subject: [PATCH] Update to 2.8.5 final Drop issue 12307 patch --- .gitignore | 1 + cmake-issue12307.patch | 82 ------------------------------------------ cmake.spec | 11 +++--- sources | 2 +- 4 files changed, 8 insertions(+), 88 deletions(-) delete mode 100644 cmake-issue12307.patch diff --git a/.gitignore b/.gitignore index 649525c..5474951 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.5-rc1.tar.gz /cmake-2.8.5-rc2.tar.gz /cmake-2.8.5-rc3.tar.gz +/cmake-2.8.5.tar.gz diff --git a/cmake-issue12307.patch b/cmake-issue12307.patch deleted file mode 100644 index eb6dfd4..0000000 --- a/cmake-issue12307.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- cmake-2.8.5-rc3/Modules/UseSWIG.cmake.issue12307 2011-06-27 08:41:05.000000000 -0600 -+++ cmake-2.8.5-rc3/Modules/UseSWIG.cmake 2011-07-21 13:27:56.660018678 -0600 -@@ -4,9 +4,6 @@ - # - Define swig module with given name and specified language - # SWIG_LINK_LIBRARIES(name [ libraries ]) - # - Link libraries to swig module --# SWIG_GET_WRAPPER_DEPENDENCIES(swigFile genWrapper language DEST_VARIABLE) --# - Put dependencies of the wrapper genWrapper generated by swig from --# swigFile in DEST_VARIABLE - # All other macros are for internal use only. - # To get the actual name of the swig module, - # use: ${SWIG_MODULE_${name}_REAL_NAME}. -@@ -42,58 +39,6 @@ - SET(SWIG_PYTHON_EXTRA_FILE_EXTENSION "py") - - # --# Get dependencies of the generated wrapper. --# --MACRO(SWIG_GET_WRAPPER_DEPENDENCIES swigFile genWrapper language DEST_VARIABLE) -- GET_FILENAME_COMPONENT(swig_getdeps_basename ${swigFile} NAME_WE) -- GET_FILENAME_COMPONENT(swig_getdeps_outdir ${genWrapper} PATH) -- GET_SOURCE_FILE_PROPERTY(swig_getdeps_extra_flags "${swigFile}" SWIG_FLAGS) -- IF("${swig_getdeps_extra_flags}" STREQUAL "NOTFOUND") -- SET(swig_getdeps_extra_flags "") -- ENDIF("${swig_getdeps_extra_flags}" STREQUAL "NOTFOUND") -- -- IF(NOT swig_getdeps_outdir) -- SET(swig_getdeps_outdir ${CMAKE_CURRENT_BINARY_DIR}) -- ENDIF(NOT swig_getdeps_outdir) -- SET(swig_getdeps_depsfile -- ${swig_getdeps_outdir}/swig_${swig_getdeps_basename}_deps.txt) -- GET_DIRECTORY_PROPERTY(swig_getdeps_include_directories INCLUDE_DIRECTORIES) -- SET(swig_getdeps_include_dirs) -- FOREACH(it ${swig_getdeps_include_directories}) -- SET(swig_getdeps_include_dirs ${swig_getdeps_include_dirs} "-I${it}") -- ENDFOREACH(it) -- EXECUTE_PROCESS( -- COMMAND ${SWIG_EXECUTABLE} -- -MM -MF ${swig_getdeps_depsfile} ${swig_getdeps_extra_flags} -- ${CMAKE_SWIG_FLAGS} -${language} -- -o ${genWrapper} ${swig_getdeps_include_dirs} ${swigFile} -- RESULT_VARIABLE swig_getdeps_result -- ERROR_VARIABLE swig_getdeps_error -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- IF(NOT ${swig_getdeps_error} EQUAL 0) -- MESSAGE(SEND_ERROR "Command \"${SWIG_EXECUTABLE} -MM -MF ${swig_getdeps_depsfile} ${swig_getdeps_extra_flags} ${CMAKE_SWIG_FLAGS} -${language} -o ${genWrapper} ${swig_getdeps_include_dirs} ${swigFile}\" failed with output:\n${swig_getdeps_error}") -- SET(swig_getdeps_dependencies "") -- ELSE(NOT ${swig_getdeps_error} EQUAL 0) -- FILE(READ ${swig_getdeps_depsfile} ${DEST_VARIABLE}) -- # Remove the first line -- STRING(REGEX REPLACE "^.+: +\\\\\n +" "" -- ${DEST_VARIABLE} "${${DEST_VARIABLE}}") -- # Clean the end of each line -- STRING(REGEX REPLACE " +(\\\\)?\n" "\n" ${DEST_VARIABLE} -- "${${DEST_VARIABLE}}") -- # Clean beginning of each line -- STRING(REGEX REPLACE "\n +" "\n" -- ${DEST_VARIABLE} "${${DEST_VARIABLE}}") -- # clean paths -- STRING(REGEX REPLACE "\\\\\\\\" "/" ${DEST_VARIABLE} -- "${${DEST_VARIABLE}}") -- STRING(REGEX REPLACE "\n" ";" -- ${DEST_VARIABLE} "${${DEST_VARIABLE}}") -- ENDIF(NOT ${swig_getdeps_error} EQUAL 0) --ENDMACRO(SWIG_GET_WRAPPER_DEPENDENCIES) -- -- --# - # For given swig module initialize variables associated with it - # - MACRO(SWIG_MODULE_INITIALIZE name language) -@@ -220,10 +165,6 @@ - IF(SWIG_MODULE_${name}_EXTRA_FLAGS) - SET(swig_extra_flags ${swig_extra_flags} ${SWIG_MODULE_${name}_EXTRA_FLAGS}) - ENDIF(SWIG_MODULE_${name}_EXTRA_FLAGS) -- SWIG_GET_WRAPPER_DEPENDENCIES("${swig_source_file_fullname}" -- "${swig_generated_file_fullname}" ${SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG} -- swig_extra_dependencies) -- LIST(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${swig_extra_dependencies}) - ADD_CUSTOM_COMMAND( - OUTPUT "${swig_generated_file_fullname}" ${swig_extra_generated_files} - # Let's create the ${swig_outdir} at execution time, in case dir contains $(OutDir) diff --git a/cmake.spec b/cmake.spec index c541cb2..36f2fcd 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc3 +%define rcver %{nil} Name: cmake Version: 2.8.5 -Release: 0.3.rc3%{?dist} +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -16,8 +16,6 @@ License: BSD URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source2: macros.cmake -# http://public.kitware.com/Bug/view.php?id=12307 - Fix swig regression -Patch0: cmake-issue12307.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,7 +56,6 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} -%patch0 -p1 -b .issue12307 %build @@ -159,6 +156,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Fri Jul 22 2011 Orion Poplawski - 2.8.5-1 +- Update to 2.8.5 final +- Drop issue 12307 patch + * Thu Jul 21 2011 Orion Poplawski - 2.8.5-0.3.rc3 - Update to 2.8.5 RC 3 - Drop upstreamed swig patch diff --git a/sources b/sources index ae51d8f..7f281e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d8018f8fa4c499e2c5b288d71660cba cmake-2.8.5-rc3.tar.gz +3c5d32cec0f4c2dc45f4c2e84f4a20c5 cmake-2.8.5.tar.gz