[cmake28/el6] Update to version 2.8.9 (updated patch from Rex Dieter) Remove patch to fix PKG_CONFIG_FOUND (upstre
Jonathan G. Underwood
jgu at fedoraproject.org
Mon Mar 4 14:21:56 UTC 2013
commit 8517277c463d12a230cbcc2f087ae87796acbe0e
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Mon Mar 4 14:21:45 2013 +0000
Update to version 2.8.9 (updated patch from Rex Dieter)
Remove patch to fix PKG_CONFIG_FOUND (upstreamed, bug #812188)
cmake-pkgconfig.patch | 55 -------------------
cmake28.patch | 144 ++++++++++++++++++++++++++++--------------------
cmake28.spec | 15 +++---
3 files changed, 92 insertions(+), 122 deletions(-)
---
diff --git a/cmake28.patch b/cmake28.patch
index c99d6b2..325c1fb 100644
--- a/cmake28.patch
+++ b/cmake28.patch
@@ -1,7 +1,7 @@
-diff -up cmake-2.8.8/bootstrap.cmake28 cmake-2.8.8/bootstrap
---- cmake-2.8.8/bootstrap.cmake28 2012-04-18 19:10:54.000000000 +0100
-+++ cmake-2.8.8/bootstrap 2012-05-07 16:20:37.396532986 +0100
-@@ -1410,8 +1410,8 @@ cmake_c_flags="${cmake_c_flags}-I`cmake_
+diff -up cmake-2.8.9/bootstrap.cmake28 cmake-2.8.9/bootstrap
+--- cmake-2.8.9/bootstrap.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/bootstrap 2013-03-04 11:44:01.580938858 +0000
+@@ -1445,8 +1445,8 @@ cmake_c_flags="${cmake_c_flags}-I`cmake_
-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.8/bootstrap.cmake28 cmake-2.8.8/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"
-@@ -1516,7 +1516,7 @@ cmake_options="-DCMAKE_BOOTSTRAP=1"
+@@ -1552,7 +1552,7 @@ cmake_options="-DCMAKE_BOOTSTRAP=1"
if [ -n "${cmake_verbose}" ]; then
cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
fi
@@ -21,9 +21,9 @@ diff -up cmake-2.8.8/bootstrap.cmake28 cmake-2.8.8/bootstrap
RES=$?
if [ "${RES}" -ne "0" ]; then
cmake_error 11 "Problem while running initial CMake"
-diff -up cmake-2.8.8/CMakeLists.txt.cmake28 cmake-2.8.8/CMakeLists.txt
---- cmake-2.8.8/CMakeLists.txt.cmake28 2012-05-07 00:44:38.666506268 +0100
-+++ cmake-2.8.8/CMakeLists.txt 2012-05-07 00:49:50.761596500 +0100
+diff -up cmake-2.8.9/CMakeLists.txt.cmake28 cmake-2.8.9/CMakeLists.txt
+--- cmake-2.8.9/CMakeLists.txt.cmake28 2012-08-09 19:15:18.000000000 +0100
++++ cmake-2.8.9/CMakeLists.txt 2013-03-04 11:44:01.580938858 +0000
@@ -151,9 +151,9 @@ MACRO(CMAKE_SETUP_TESTING)
# the ctest from this cmake is used for testing
# and not the ctest from the cmake building and testing
@@ -37,10 +37,10 @@ diff -up cmake-2.8.8/CMakeLists.txt.cmake28 cmake-2.8.8/CMakeLists.txt
ENDIF(BUILD_TESTING)
# configure some files for testing
-diff -up cmake-2.8.8/Source/cmake.cxx.cmake28 cmake-2.8.8/Source/cmake.cxx
---- cmake-2.8.8/Source/cmake.cxx.cmake28 2012-05-07 14:56:43.841600253 +0100
-+++ cmake-2.8.8/Source/cmake.cxx 2012-05-08 00:56:21.035564334 +0100
-@@ -950,7 +950,7 @@ int cmake::AddCMakePaths()
+diff -up cmake-2.8.9/Source/cmake.cxx.cmake28 cmake-2.8.9/Source/cmake.cxx
+--- cmake-2.8.9/Source/cmake.cxx.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Source/cmake.cxx 2013-03-04 11:44:01.581941833 +0000
+@@ -949,7 +949,7 @@ int cmake::AddCMakePaths()
// Find the cmake executable
std::string cMakeSelf = cmSystemTools::GetExecutableDirectory();
cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str());
@@ -49,7 +49,7 @@ diff -up cmake-2.8.8/Source/cmake.cxx.cmake28 cmake-2.8.8/Source/cmake.cxx
cMakeSelf += cmSystemTools::GetExecutableExtension();
#if __APPLE__
// on the apple this might be the gui bundle
-@@ -995,12 +995,12 @@ int cmake::AddCMakePaths()
+@@ -994,12 +994,12 @@ int cmake::AddCMakePaths()
if( !cmSystemTools::FileExists(editCacheCommand.c_str()))
{
editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -64,7 +64,7 @@ diff -up cmake-2.8.8/Source/cmake.cxx.cmake28 cmake-2.8.8/Source/cmake.cxx
}
if(cmSystemTools::FileExists(editCacheCommand.c_str()))
{
-@@ -1010,7 +1010,7 @@ int cmake::AddCMakePaths()
+@@ -1009,7 +1009,7 @@ int cmake::AddCMakePaths()
}
}
std::string ctestCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -73,7 +73,7 @@ diff -up cmake-2.8.8/Source/cmake.cxx.cmake28 cmake-2.8.8/Source/cmake.cxx
if(cmSystemTools::FileExists(ctestCommand.c_str()))
{
this->CacheManager->AddCacheEntry
-@@ -1018,7 +1018,7 @@ int cmake::AddCMakePaths()
+@@ -1017,7 +1017,7 @@ int cmake::AddCMakePaths()
"Path to ctest program executable.", cmCacheManager::INTERNAL);
}
std::string cpackCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -82,7 +82,7 @@ diff -up cmake-2.8.8/Source/cmake.cxx.cmake28 cmake-2.8.8/Source/cmake.cxx
if(cmSystemTools::FileExists(cpackCommand.c_str()))
{
this->CacheManager->AddCacheEntry
-@@ -3024,7 +3024,7 @@ const char* cmake::GetCTestCommand()
+@@ -3023,7 +3023,7 @@ const char* cmake::GetCTestCommand()
{
if ( this->CTestCommand.empty() )
{
@@ -91,7 +91,7 @@ diff -up cmake-2.8.8/Source/cmake.cxx.cmake28 cmake-2.8.8/Source/cmake.cxx
}
if ( this->CTestCommand.empty() )
{
-@@ -3038,7 +3038,7 @@ const char* cmake::GetCPackCommand()
+@@ -3037,7 +3037,7 @@ const char* cmake::GetCPackCommand()
{
if ( this->CPackCommand.empty() )
{
@@ -100,10 +100,10 @@ diff -up cmake-2.8.8/Source/cmake.cxx.cmake28 cmake-2.8.8/Source/cmake.cxx
}
if ( this->CPackCommand.empty() )
{
-diff -up cmake-2.8.8/Source/CMakeLists.txt.cmake28 cmake-2.8.8/Source/CMakeLists.txt
---- cmake-2.8.8/Source/CMakeLists.txt.cmake28 2012-05-07 00:39:23.197506219 +0100
-+++ cmake-2.8.8/Source/CMakeLists.txt 2012-05-07 12:57:49.292534833 +0100
-@@ -522,8 +522,8 @@ IF(APPLE)
+diff -up cmake-2.8.9/Source/CMakeLists.txt.cmake28 cmake-2.8.9/Source/CMakeLists.txt
+--- cmake-2.8.9/Source/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Source/CMakeLists.txt 2013-03-04 11:44:01.582942064 +0000
+@@ -520,8 +520,8 @@ IF(APPLE)
ENDIF(APPLE)
# Build CMake executable
@@ -114,7 +114,7 @@ diff -up cmake-2.8.8/Source/CMakeLists.txt.cmake28 cmake-2.8.8/Source/CMakeLists
# Build special executable for running programs on Windows 98
IF(WIN32)
-@@ -535,12 +535,12 @@ IF(WIN32)
+@@ -533,12 +533,12 @@ IF(WIN32)
ENDIF(WIN32)
# Build CTest executable
@@ -131,7 +131,7 @@ diff -up cmake-2.8.8/Source/CMakeLists.txt.cmake28 cmake-2.8.8/Source/CMakeLists
# Curses GUI
IF(BUILD_CursesDialog)
-@@ -556,9 +556,9 @@ ENDIF(BUILD_QtDialog)
+@@ -554,9 +554,9 @@ ENDIF(BUILD_QtDialog)
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.8/Source/CMakeLists.txt.cmake28 cmake-2.8.8/Source/CMakeLists
IF(APPLE)
INSTALL_TARGETS(/bin cmakexbuild)
ENDIF(APPLE)
-diff -up cmake-2.8.8/Source/cmCTest.cxx.cmake28 cmake-2.8.8/Source/cmCTest.cxx
---- cmake-2.8.8/Source/cmCTest.cxx.cmake28 2012-05-07 20:23:17.449503203 +0100
-+++ cmake-2.8.8/Source/cmCTest.cxx 2012-05-07 20:23:51.737506353 +0100
-@@ -2465,7 +2465,7 @@ void cmCTest::FindRunningCMake()
+diff -up cmake-2.8.9/Source/cmCTest.cxx.cmake28 cmake-2.8.9/Source/cmCTest.cxx
+--- cmake-2.8.9/Source/cmCTest.cxx.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Source/cmCTest.cxx 2013-03-04 11:44:01.583942125 +0000
+@@ -2486,7 +2486,7 @@ void cmCTest::FindRunningCMake()
{
// Find our own executable.
this->CTestSelf = cmSystemTools::GetExecutableDirectory();
@@ -156,7 +156,7 @@ diff -up cmake-2.8.8/Source/cmCTest.cxx.cmake28 cmake-2.8.8/Source/cmCTest.cxx
this->CTestSelf += cmSystemTools::GetExecutableExtension();
if(!cmSystemTools::FileExists(this->CTestSelf.c_str()))
{
-@@ -2474,7 +2474,7 @@ void cmCTest::FindRunningCMake()
+@@ -2495,7 +2495,7 @@ void cmCTest::FindRunningCMake()
}
this->CMakeSelf = cmSystemTools::GetExecutableDirectory();
@@ -165,10 +165,10 @@ diff -up cmake-2.8.8/Source/cmCTest.cxx.cmake28 cmake-2.8.8/Source/cmCTest.cxx
this->CMakeSelf += cmSystemTools::GetExecutableExtension();
if(!cmSystemTools::FileExists(this->CMakeSelf.c_str()))
{
-diff -up cmake-2.8.8/Source/cmGlobalGenerator.cxx.cmake28 cmake-2.8.8/Source/cmGlobalGenerator.cxx
---- cmake-2.8.8/Source/cmGlobalGenerator.cxx.cmake28 2012-05-07 19:14:47.742503547 +0100
-+++ cmake-2.8.8/Source/cmGlobalGenerator.cxx 2012-05-07 19:15:25.869555965 +0100
-@@ -1970,7 +1970,7 @@ void cmGlobalGenerator::CreateDefaultGlo
+diff -up cmake-2.8.9/Source/cmGlobalGenerator.cxx.cmake28 cmake-2.8.9/Source/cmGlobalGenerator.cxx
+--- cmake-2.8.9/Source/cmGlobalGenerator.cxx.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Source/cmGlobalGenerator.cxx 2013-03-04 11:44:01.583942125 +0000
+@@ -1980,7 +1980,7 @@ void cmGlobalGenerator::CreateDefaultGlo
// 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,9 +177,9 @@ diff -up cmake-2.8.8/Source/cmGlobalGenerator.cxx.cmake28 cmake-2.8.8/Source/cmG
}
singleLine.push_back(cmd.c_str());
if ( cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.' )
-diff -up cmake-2.8.8/Source/CursesDialog/CMakeLists.txt.cmake28 cmake-2.8.8/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.8/Source/CursesDialog/CMakeLists.txt.cmake28 2012-05-07 00:41:32.468540511 +0100
-+++ cmake-2.8.8/Source/CursesDialog/CMakeLists.txt 2012-05-07 13:09:06.055533890 +0100
+diff -up cmake-2.8.9/Source/CursesDialog/CMakeLists.txt.cmake28 cmake-2.8.9/Source/CursesDialog/CMakeLists.txt
+--- cmake-2.8.9/Source/CursesDialog/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Source/CursesDialog/CMakeLists.txt 2013-03-04 11:44:01.584942171 +0000
@@ -30,8 +30,8 @@ INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/
INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
@@ -193,9 +193,9 @@ diff -up cmake-2.8.8/Source/CursesDialog/CMakeLists.txt.cmake28 cmake-2.8.8/Sour
-INSTALL_TARGETS(/bin ccmake)
+INSTALL_TARGETS(/bin ccmake28)
-diff -up cmake-2.8.8/Source/QtDialog/CMake.desktop.cmake28 cmake-2.8.8/Source/QtDialog/CMake.desktop
---- cmake-2.8.8/Source/QtDialog/CMake.desktop.cmake28 2012-05-07 21:33:56.021506359 +0100
-+++ cmake-2.8.8/Source/QtDialog/CMake.desktop 2012-05-07 21:34:11.907565365 +0100
+diff -up cmake-2.8.9/Source/QtDialog/CMake.desktop.cmake28 cmake-2.8.9/Source/QtDialog/CMake.desktop
+--- cmake-2.8.9/Source/QtDialog/CMake.desktop.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Source/QtDialog/CMake.desktop 2013-03-04 11:44:01.584942171 +0000
@@ -1,9 +1,9 @@
[Desktop Entry]
Version=1.0
@@ -209,9 +209,9 @@ diff -up cmake-2.8.8/Source/QtDialog/CMake.desktop.cmake28 cmake-2.8.8/Source/Qt
Terminal=false
X-MultipleArgs=false
Type=Application
-diff -up cmake-2.8.8/Source/QtDialog/CMakeLists.txt.cmake28 cmake-2.8.8/Source/QtDialog/CMakeLists.txt
---- cmake-2.8.8/Source/QtDialog/CMakeLists.txt.cmake28 2012-05-07 20:04:45.957502375 +0100
-+++ cmake-2.8.8/Source/QtDialog/CMakeLists.txt 2012-05-07 20:05:04.508565061 +0100
+diff -up cmake-2.8.9/Source/QtDialog/CMakeLists.txt.cmake28 cmake-2.8.9/Source/QtDialog/CMakeLists.txt
+--- cmake-2.8.9/Source/QtDialog/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Source/QtDialog/CMakeLists.txt 2013-03-04 11:44:01.584942171 +0000
@@ -69,8 +69,8 @@ ELSE(NOT QT4_FOUND)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@ -242,10 +242,34 @@ diff -up cmake-2.8.8/Source/QtDialog/CMakeLists.txt.cmake28 cmake-2.8.8/Source/Q
ENDIF(UNIX)
IF(APPLE)
-diff -up cmake-2.8.8/Tests/CMakeLists.txt.cmake28 cmake-2.8.8/Tests/CMakeLists.txt
---- cmake-2.8.8/Tests/CMakeLists.txt.cmake28 2012-05-07 20:49:04.502506270 +0100
-+++ cmake-2.8.8/Tests/CMakeLists.txt 2012-05-07 20:48:32.143564937 +0100
-@@ -2087,7 +2087,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+diff -up cmake-2.8.9/Tests/CMakeLists.txt.cmake28 cmake-2.8.9/Tests/CMakeLists.txt
+--- cmake-2.8.9/Tests/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Tests/CMakeLists.txt 2013-03-04 13:51:32.127999238 +0000
+@@ -1754,9 +1754,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+ file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA"
+ DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCoverage")
+ add_test(NAME CTestGTMCoverage
+- COMMAND cmake -E chdir
++ COMMAND cmake28 -E chdir
+ ${CMake_BINARY_DIR}/Testing/MumpsCoverage
+- $<TARGET_FILE:ctest> -T Coverage --debug)
++ $<TARGET_FILE:ctest28> -T Coverage --debug)
+ set_tests_properties(CTestGTMCoverage PROPERTIES
+ PASS_REGULAR_EXPRESSION
+ "Process file.*XINDEX.m.*Total LOC:.*127.*Percentage Coverage: 85.83.*"
+@@ -1771,9 +1771,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+ file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA"
+ DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage")
+ add_test(NAME CTestCacheCoverage
+- COMMAND cmake -E chdir
++ COMMAND cmake28 -E chdir
+ ${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage
+- $<TARGET_FILE:ctest> -T Coverage --debug)
++ $<TARGET_FILE:ctest28> -T Coverage --debug)
+ set_tests_properties(CTestCacheCoverage PROPERTIES
+ PASS_REGULAR_EXPRESSION
+ "Process file.*XINDEX.m.*Total LOC:.*125.*Percentage Coverage: 85.60.*"
+@@ -2170,7 +2170,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
--build-makeprogram ${bootstrap}
--build-generator "${CMAKE_TEST_GENERATOR}"
--test-command
@@ -254,18 +278,18 @@ diff -up cmake-2.8.8/Tests/CMakeLists.txt.cmake28 cmake-2.8.8/Tests/CMakeLists.t
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.8/Tests/CMakeTests/CMakeLists.txt.cmake28 cmake-2.8.8/Tests/CMakeTests/CMakeLists.txt
---- cmake-2.8.8/Tests/CMakeTests/CMakeLists.txt.cmake28 2012-05-07 23:44:48.583506579 +0100
-+++ cmake-2.8.8/Tests/CMakeTests/CMakeLists.txt 2012-05-07 23:44:58.533534145 +0100
+diff -up cmake-2.8.9/Tests/CMakeTests/CMakeLists.txt.cmake28 cmake-2.8.9/Tests/CMakeTests/CMakeLists.txt
+--- cmake-2.8.9/Tests/CMakeTests/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Tests/CMakeTests/CMakeLists.txt 2013-03-04 11:44:01.585942131 +0000
@@ -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.8/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 cmake-2.8.8/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
---- cmake-2.8.8/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 2012-05-08 01:07:50.530533802 +0100
-+++ cmake-2.8.8/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake 2012-05-08 01:08:35.698502662 +0100
+diff -up cmake-2.8.9/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 cmake-2.8.9/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+--- cmake-2.8.9/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake 2013-03-04 11:44:01.585942131 +0000
@@ -10,7 +10,7 @@ if(NOT CPackGen)
message(FATAL_ERROR "CPackGen not set")
endif(NOT CPackGen)
@@ -275,9 +299,9 @@ diff -up cmake-2.8.8/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmak
message("cpack = ${CPackCommand}")
if(NOT CPackCommand)
message(FATAL_ERROR "CPackCommand not set")
-diff -up cmake-2.8.8/Tests/CTestConfig/dashboard.cmake.in.cmake28 cmake-2.8.8/Tests/CTestConfig/dashboard.cmake.in
---- cmake-2.8.8/Tests/CTestConfig/dashboard.cmake.in.cmake28 2012-05-08 00:24:26.603506491 +0100
-+++ cmake-2.8.8/Tests/CTestConfig/dashboard.cmake.in 2012-05-08 00:24:54.081565599 +0100
+diff -up cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in.cmake28 cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in
+--- cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in 2013-03-04 11:44:01.586942112 +0000
@@ -5,7 +5,7 @@ set(CTEST_BINARY_DIRECTORY "@CMake_BINAR
file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
@@ -287,9 +311,9 @@ diff -up cmake-2.8.8/Tests/CTestConfig/dashboard.cmake.in.cmake28 cmake-2.8.8/Te
message("CMAKE_COMMAND='${CMAKE_COMMAND}'")
message("CMAKE_CTEST_COMMAND='${CMAKE_CTEST_COMMAND}'")
-diff -up cmake-2.8.8/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 cmake-2.8.8/Tests/FindPackageModeMakefileTest/CMakeLists.txt
---- cmake-2.8.8/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 2012-05-08 00:28:03.942506390 +0100
-+++ cmake-2.8.8/Tests/FindPackageModeMakefileTest/CMakeLists.txt 2012-05-08 00:28:16.846503117 +0100
+diff -up cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+--- cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt 2013-03-04 11:44:01.586942112 +0000
@@ -19,7 +19,7 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCH
configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake @ONLY)
@@ -299,9 +323,9 @@ diff -up cmake-2.8.8/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 cm
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.8/Utilities/CMakeLists.txt.cmake28 cmake-2.8.8/Utilities/CMakeLists.txt
---- cmake-2.8.8/Utilities/CMakeLists.txt.cmake28 2012-05-07 12:27:20.431502388 +0100
-+++ cmake-2.8.8/Utilities/CMakeLists.txt 2012-05-07 16:48:22.128565026 +0100
+diff -up cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 cmake-2.8.9/Utilities/CMakeLists.txt
+--- cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
++++ cmake-2.8.9/Utilities/CMakeLists.txt 2013-03-04 11:44:01.586942112 +0000
@@ -17,32 +17,32 @@ MAKE_DIRECTORY(${CMake_BINARY_DIR}/Docs)
SET(DOC_FILES "")
diff --git a/cmake28.spec b/cmake28.spec
index b07d669..345e1c3 100644
--- a/cmake28.spec
+++ b/cmake28.spec
@@ -7,8 +7,8 @@
%define rcver %{nil}
Name: cmake28
-Version: 2.8.8
-Release: 4%{?dist}
+Version: 2.8.9
+Release: 1%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@@ -23,10 +23,8 @@ 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
-# (modified) Upstream patch to fix setting PKG_CONFIG_FOUND (bug #812188)
-Patch1: cmake-pkgconfig.patch
# This patch renames the executables with a "28" suffix
-Patch2: cmake28.patch
+Patch1: cmake28.patch
# Source/kwsys/MD5.c
# see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries
@@ -72,8 +70,7 @@ 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 .pkgconfig
-%patch2 -p1 -b .cmake28
+%patch1 -p1 -b .cmake28
%build
@@ -169,6 +166,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Fri Mar 1 2013 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.8.9-1
+- Update to version 2.8.9 (updated patch from Rex Dieter)
+- Remove patch to fix PKG_CONFIG_FOUND (upstreamed, bug #812188)
+
* Thu May 10 2012 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.8.8-4
- Further correction to the License tag
- Add Provides: bundled(md5-deutsch)
More information about the scm-commits
mailing list