[cmake28/el6] Initial import (#819678)
Jonathan G. Underwood
jgu at fedoraproject.org
Thu May 10 15:57:02 UTC 2012
commit 141fe7ee469925b5d0253989bdf06655ef165619
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Thu May 10 16:56:51 2012 +0100
Initial import (#819678)
.gitignore | 1 +
cmake-dcmtk.patch | 90 ++++++++
cmake-pkgconfig.patch | 55 +++++
cmake28.patch | 442 +++++++++++++++++++++++++++++++++++++++
cmake28.spec | 544 +++++++++++++++++++++++++++++++++++++++++++++++++
macros.cmake28 | 24 +++
sources | 1 +
7 files changed, 1157 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..f862d9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/cmake-2.8.8.tar.gz
diff --git a/cmake-dcmtk.patch b/cmake-dcmtk.patch
new file mode 100644
index 0000000..d7f77bf
--- /dev/null
+++ b/cmake-dcmtk.patch
@@ -0,0 +1,90 @@
+diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/FindDCMTK.cmake
+--- cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk 2011-08-26 10:51:46.000000000 -0600
++++ cmake-2.8.6-rc1/Modules/FindDCMTK.cmake 2011-08-29 16:58:07.299550799 -0600
+@@ -30,6 +30,10 @@
+ # Written for VXL by Amitha Perera.
+ # Upgraded for GDCM by Mathieu Malaterre.
+ # Modified for EasyViz by Thomas Sondergaard.
++#
++# Wed Jul 27 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org>
++# - Add all dcmtk libs
++# - Add usr/lib to paths
+ #
+
+ if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
+@@ -44,20 +48,26 @@ endif()
+
+ foreach(lib
+ dcmdata
++ dcmdsig
+ dcmimage
+ dcmimgle
+ dcmjpeg
++ dcmjpls
+ dcmnet
+ dcmpstat
+ dcmqrdb
+- dcmsign
+ dcmsr
+ dcmtls
++ dcmwlm
+ ijg12
+ ijg16
+ ijg8
++ libi2d
++ oflog
+ ofstd)
+
++
++
+ find_library(DCMTK_${lib}_LIBRARY
+ ${lib}
+ PATHS
+@@ -66,7 +76,8 @@ foreach(lib
+ ${DCMTK_DIR}/${lib}/libsrc/Debug
+ ${DCMTK_DIR}/${lib}/Release
+ ${DCMTK_DIR}/${lib}/Debug
+- ${DCMTK_DIR}/lib)
++ ${DCMTK_DIR}/lib
++ /usr/lib/dcmtk)
+
+ mark_as_advanced(DCMTK_${lib}_LIBRARY)
+
+@@ -82,13 +93,16 @@ set(DCMTK_dcmdata_TEST_HEADER dctypes.h)
+ set(DCMTK_dcmimage_TEST_HEADER dicoimg.h)
+ set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h)
+ set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h)
++set(DCMTK_dcmjpls_TEST_HEADER djcodecd.h)
+ set(DCMTK_dcmnet_TEST_HEADER assoc.h)
+ set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h)
+ set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h)
+ set(DCMTK_dcmsign_TEST_HEADER sicert.h)
+ set(DCMTK_dcmsr_TEST_HEADER dsrtree.h)
+ set(DCMTK_dcmtls_TEST_HEADER tlslayer.h)
++set(DCMTK_dcmwlm_TEST_HEADER wldsfs.h)
+ set(DCMTK_ofstd_TEST_HEADER ofstdinc.h)
++set(DCMTK_oflog_TEST_HEADER oflog.h)
+
+ foreach(dir
+ config
+@@ -96,16 +110,20 @@ foreach(dir
+ dcmimage
+ dcmimgle
+ dcmjpeg
++ dcmjpls
+ dcmnet
+ dcmpstat
+ dcmqrdb
+ dcmsign
+ dcmsr
+ dcmtls
++ dcmwlen
++ oflog
+ ofstd)
+ find_path(DCMTK_${dir}_INCLUDE_DIR
+ ${DCMTK_${dir}_TEST_HEADER}
+ PATHS
++ /usr/include/dcmtk
+ ${DCMTK_DIR}/${dir}/include
+ ${DCMTK_DIR}/${dir}
+ ${DCMTK_DIR}/include/${dir}
diff --git a/cmake-pkgconfig.patch b/cmake-pkgconfig.patch
new file mode 100644
index 0000000..5dfea69
--- /dev/null
+++ b/cmake-pkgconfig.patch
@@ -0,0 +1,55 @@
+commit 8bd38d7070b1cec6ed27b71d0359f1b2ccd1e1c8
+Author: Rolf Eike Beer <eike at sf-mail.de>
+Date: Fri Apr 13 08:50:49 2012 +0200
+
+ FindPkgConfig.cmake: fix documented output variable no longer set (#13125)
+
+ The real fix is from Yury G. Kudryashov while I added the surrounding cleanups.
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 5d93ab1..30aab45 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -13,11 +13,10 @@
+ # When the 'QUIET' argument is set, no status messages will be printed.
+ #
+ # It sets the following variables:
+-# PKG_CONFIG_FOUND ... true if pkg-config works on the system
++# PKG_CONFIG_FOUND ... if pkg-config executable was found
+ # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
+ # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
+ # (since CMake 2.8.8)
+-# PKG_CONFIG_FOUND ... if pkg-config executable was found
+ #
+ # For the following variables two sets of values exist; first one is the
+ # common one and has the given PREFIX. The second set contains flags
+@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
+ REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+ VERSION_VAR PKG_CONFIG_VERSION_STRING)
+
++# This is needed because the module name is "PkgConfig" but the name of
++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
++# handled by FPHSA.
++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
++
+ # Unsets the given variables
+ macro(_pkgconfig_unset var)
+ set(${var} "" CACHE INTERNAL "")
+diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+index 6604208..fc65e58 100644
+--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
++++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+@@ -71,7 +71,7 @@ endmacro(check_version_string)
+ # reported.
+
+ foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
+- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
++ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
+ check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
+ endforeach(VTEST)
+
+@@ -82,4 +82,3 @@ endforeach(VTEST)
+
+ check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
+ check_version_string(SUBVERSION Subversion_VERSION_SVN)
+-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)
diff --git a/cmake28.patch b/cmake28.patch
new file mode 100644
index 0000000..c99d6b2
--- /dev/null
+++ b/cmake28.patch
@@ -0,0 +1,442 @@
+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_
+ -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}\"`"
+-echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile"
+-echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile"
++echo "cmake28: ${objs}" > "${cmake_bootstrap_dir}/Makefile"
++echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake28" >> "${cmake_bootstrap_dir}/Makefile"
+ 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"
+ if [ -n "${cmake_verbose}" ]; then
+ cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
+ fi
+-"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} "$@"
++"${cmake_bootstrap_dir}/cmake28" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} "$@"
+ 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
+@@ -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
+ # cmake.
+- SET(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest")
+- SET(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake")
+- SET(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack")
++ SET(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest28")
++ SET(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake28")
++ SET(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack28")
+ 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()
+ // Find the cmake executable
+ std::string cMakeSelf = cmSystemTools::GetExecutableDirectory();
+ cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str());
+- cMakeSelf += "/cmake";
++ cMakeSelf += "/cmake28";
+ cMakeSelf += cmSystemTools::GetExecutableExtension();
+ #if __APPLE__
+ // on the apple this might be the gui bundle
+@@ -995,12 +995,12 @@ int cmake::AddCMakePaths()
+ if( !cmSystemTools::FileExists(editCacheCommand.c_str()))
+ {
+ editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
+- "/ccmake" + cmSystemTools::GetFilenameExtension(cMakeSelf);
++ "/ccmake28" + cmSystemTools::GetFilenameExtension(cMakeSelf);
+ }
+ if( !cmSystemTools::FileExists(editCacheCommand.c_str()))
+ {
+ editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
+- "/cmake-gui" + cmSystemTools::GetFilenameExtension(cMakeSelf);
++ "/cmake28-gui" + cmSystemTools::GetFilenameExtension(cMakeSelf);
+ }
+ if(cmSystemTools::FileExists(editCacheCommand.c_str()))
+ {
+@@ -1010,7 +1010,7 @@ int cmake::AddCMakePaths()
+ }
+ }
+ std::string ctestCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
+- "/ctest" + cmSystemTools::GetFilenameExtension(cMakeSelf);
++ "/ctest28" + cmSystemTools::GetFilenameExtension(cMakeSelf);
+ if(cmSystemTools::FileExists(ctestCommand.c_str()))
+ {
+ this->CacheManager->AddCacheEntry
+@@ -1018,7 +1018,7 @@ int cmake::AddCMakePaths()
+ "Path to ctest program executable.", cmCacheManager::INTERNAL);
+ }
+ std::string cpackCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
+- "/cpack" + cmSystemTools::GetFilenameExtension(cMakeSelf);
++ "/cpack28" + cmSystemTools::GetFilenameExtension(cMakeSelf);
+ if(cmSystemTools::FileExists(cpackCommand.c_str()))
+ {
+ this->CacheManager->AddCacheEntry
+@@ -3024,7 +3024,7 @@ const char* cmake::GetCTestCommand()
+ {
+ if ( this->CTestCommand.empty() )
+ {
+- this->CTestCommand = this->FindCMakeProgram("ctest");
++ this->CTestCommand = this->FindCMakeProgram("ctest28");
+ }
+ if ( this->CTestCommand.empty() )
+ {
+@@ -3038,7 +3038,7 @@ const char* cmake::GetCPackCommand()
+ {
+ if ( this->CPackCommand.empty() )
+ {
+- this->CPackCommand = this->FindCMakeProgram("cpack");
++ this->CPackCommand = this->FindCMakeProgram("cpack28");
+ }
+ 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)
+ ENDIF(APPLE)
+
+ # Build CMake executable
+-ADD_EXECUTABLE(cmake cmakemain.cxx)
+-TARGET_LINK_LIBRARIES(cmake CMakeLib)
++ADD_EXECUTABLE(cmake28 cmakemain.cxx)
++TARGET_LINK_LIBRARIES(cmake28 CMakeLib)
+
+ # Build special executable for running programs on Windows 98
+ IF(WIN32)
+@@ -535,12 +535,12 @@ IF(WIN32)
+ ENDIF(WIN32)
+
+ # Build CTest executable
+-ADD_EXECUTABLE(ctest ctest.cxx)
+-TARGET_LINK_LIBRARIES(ctest CTestLib)
++ADD_EXECUTABLE(ctest28 ctest.cxx)
++TARGET_LINK_LIBRARIES(ctest28 CTestLib)
+
+ # Build CPack executable
+-ADD_EXECUTABLE(cpack CPack/cpack.cxx)
+-TARGET_LINK_LIBRARIES(cpack CPackLib)
++ADD_EXECUTABLE(cpack28 CPack/cpack.cxx)
++TARGET_LINK_LIBRARIES(cpack28 CPackLib)
+
+ # Curses GUI
+ IF(BUILD_CursesDialog)
+@@ -556,9 +556,9 @@ ENDIF(BUILD_QtDialog)
+ INCLUDE (${CMake_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
+ INCLUDE (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
+
+-INSTALL_TARGETS(/bin cmake)
+-INSTALL_TARGETS(/bin ctest)
+-INSTALL_TARGETS(/bin cpack)
++INSTALL_TARGETS(/bin cmake28)
++INSTALL_TARGETS(/bin ctest28)
++INSTALL_TARGETS(/bin cpack28)
+ 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()
+ {
+ // Find our own executable.
+ this->CTestSelf = cmSystemTools::GetExecutableDirectory();
+- this->CTestSelf += "/ctest";
++ this->CTestSelf += "/ctest28";
+ this->CTestSelf += cmSystemTools::GetExecutableExtension();
+ if(!cmSystemTools::FileExists(this->CTestSelf.c_str()))
+ {
+@@ -2474,7 +2474,7 @@ void cmCTest::FindRunningCMake()
+ }
+
+ this->CMakeSelf = cmSystemTools::GetExecutableDirectory();
+- this->CMakeSelf += "/cmake";
++ this->CMakeSelf += "/cmake28";
+ 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
+ // 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.
+- cmd = "cmake";
++ cmd = "cmake28";
+ }
+ 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
+@@ -30,8 +30,8 @@ INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/
+ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
+
+
+-ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
+-TARGET_LINK_LIBRARIES(ccmake CMakeLib)
+-TARGET_LINK_LIBRARIES(ccmake cmForm)
++ADD_EXECUTABLE(ccmake28 ${CURSES_SRCS} )
++TARGET_LINK_LIBRARIES(ccmake28 CMakeLib)
++TARGET_LINK_LIBRARIES(ccmake28 cmForm)
+
+-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
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+ Version=1.0
+-Name=CMake
++Name=CMake28
+ Comment=Cross-platform buildsystem
+-Exec=cmake-gui %f
+-Icon=CMakeSetup32.png
++Exec=cmake28-gui %f
++Icon=CMake28Setup32.png
+ 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
+@@ -69,8 +69,8 @@ ELSE(NOT QT4_FOUND)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+- ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
+- TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
++ ADD_EXECUTABLE(cmake28-gui WIN32 MACOSX_BUNDLE ${SRCS})
++ TARGET_LINK_LIBRARIES(cmake28-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
+ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+ IF(APPLE)
+ SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
+@@ -80,14 +80,14 @@ ELSE(NOT QT4_FOUND)
+ BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
+ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+
+- INSTALL(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
++ INSTALL(TARGETS cmake28-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
+
+ IF(UNIX)
+ # install a desktop file so CMake appears in the application start menu
+ # with an icon
+- INSTALL(FILES CMake.desktop DESTINATION share/applications )
+- INSTALL(FILES CMakeSetup32.png DESTINATION share/pixmaps )
+- INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
++ INSTALL(FILES CMake.desktop DESTINATION share/applications RENAME CMake28.desktop)
++ INSTALL(FILES CMakeSetup32.png DESTINATION share/pixmaps RENAME CMake28Setup32.png)
++ INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages RENAME cmake28cache.xml)
+ 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=
+ --build-makeprogram ${bootstrap}
+ --build-generator "${CMAKE_TEST_GENERATOR}"
+ --test-command
+- ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake)
++ ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake28)
+ 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
+@@ -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
+@@ -10,7 +10,7 @@ if(NOT CPackGen)
+ message(FATAL_ERROR "CPackGen not set")
+ endif(NOT CPackGen)
+ 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.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
+@@ -5,7 +5,7 @@ set(CTEST_BINARY_DIRECTORY "@CMake_BINAR
+ file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+
+ get_filename_component(dir "${CMAKE_COMMAND}" PATH)
+-set(CMAKE_CTEST_COMMAND "${dir}/ctest")
++set(CMAKE_CTEST_COMMAND "${dir}/ctest28")
+
+ 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
+@@ -19,7 +19,7 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCH
+ configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake @ONLY)
+
+ # now set up the test:
+- get_target_property(cmakeExecutable cmake LOCATION)
++ get_target_property(cmakeExecutable cmake28 LOCATION)
+
+ 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
+@@ -17,32 +17,32 @@ MAKE_DIRECTORY(${CMake_BINARY_DIR}/Docs)
+ SET(DOC_FILES "")
+
+ SET(MAN_FILES
+- ${CMake_BINARY_DIR}/Docs/cmake.1
+- ${CMake_BINARY_DIR}/Docs/cmakecommands.1
+- ${CMake_BINARY_DIR}/Docs/cmakecompat.1
+- ${CMake_BINARY_DIR}/Docs/cmakeprops.1
+- ${CMake_BINARY_DIR}/Docs/cmakepolicies.1
+- ${CMake_BINARY_DIR}/Docs/cmakevars.1
+- ${CMake_BINARY_DIR}/Docs/cmakemodules.1
++ ${CMake_BINARY_DIR}/Docs/cmake28.1
++ ${CMake_BINARY_DIR}/Docs/cmake28commands.1
++ ${CMake_BINARY_DIR}/Docs/cmake28compat.1
++ ${CMake_BINARY_DIR}/Docs/cmake28props.1
++ ${CMake_BINARY_DIR}/Docs/cmake28policies.1
++ ${CMake_BINARY_DIR}/Docs/cmake28vars.1
++ ${CMake_BINARY_DIR}/Docs/cmake28modules.1
+ )
+ SET(TEXT_FILES
+- ${CMake_BINARY_DIR}/Docs/cmake.txt
+- ${CMake_BINARY_DIR}/Docs/cmake.docbook
+- ${CMake_BINARY_DIR}/Docs/cmake-policies.txt
+- ${CMake_BINARY_DIR}/Docs/cmake-properties.txt
+- ${CMake_BINARY_DIR}/Docs/cmake-variables.txt
+- ${CMake_BINARY_DIR}/Docs/cmake-modules.txt
+- ${CMake_BINARY_DIR}/Docs/cmake-commands.txt
+- ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.txt
++ ${CMake_BINARY_DIR}/Docs/cmake28.txt
++ ${CMake_BINARY_DIR}/Docs/cmake28.docbook
++ ${CMake_BINARY_DIR}/Docs/cmake28-policies.txt
++ ${CMake_BINARY_DIR}/Docs/cmake28-properties.txt
++ ${CMake_BINARY_DIR}/Docs/cmake28-variables.txt
++ ${CMake_BINARY_DIR}/Docs/cmake28-modules.txt
++ ${CMake_BINARY_DIR}/Docs/cmake28-commands.txt
++ ${CMake_BINARY_DIR}/Docs/cmake28-compatcommands.txt
+ )
+ SET(HTML_FILES
+- ${CMake_BINARY_DIR}/Docs/cmake.html
+- ${CMake_BINARY_DIR}/Docs/cmake-policies.html
+- ${CMake_BINARY_DIR}/Docs/cmake-properties.html
+- ${CMake_BINARY_DIR}/Docs/cmake-variables.html
+- ${CMake_BINARY_DIR}/Docs/cmake-modules.html
+- ${CMake_BINARY_DIR}/Docs/cmake-commands.html
+- ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html
++ ${CMake_BINARY_DIR}/Docs/cmake28.html
++ ${CMake_BINARY_DIR}/Docs/cmake28-policies.html
++ ${CMake_BINARY_DIR}/Docs/cmake28-properties.html
++ ${CMake_BINARY_DIR}/Docs/cmake28-variables.html
++ ${CMake_BINARY_DIR}/Docs/cmake28-modules.html
++ ${CMake_BINARY_DIR}/Docs/cmake28-commands.html
++ ${CMake_BINARY_DIR}/Docs/cmake28-compatcommands.html
+ )
+
+ MACRO(ADD_DOCS target dependency)
+@@ -85,51 +85,51 @@ ENDIF(BUILD_QtDialog AND "${CMAKE_GENERA
+ AND EXISTS "${QT_QMAKE_EXECUTABLE}" AND NOT CMAKE_NO_AUTO_QT_ENV)
+
+ # add the docs for the executables
+-ADD_DOCS(ctest ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
+-ADD_DOCS(cpack ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
+-ADD_DOCS(ccmake ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
++ADD_DOCS(ctest28 ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
++ADD_DOCS(cpack28 ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
++ADD_DOCS(ccmake28 ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
+ ADD_DOCS(CMakeSetup ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
+-ADD_DOCS(cmake-gui ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
++ADD_DOCS(cmake28-gui ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
+
+ # add the documentation for cmake itself
+
+-GET_TARGET_PROPERTY(CMD cmake LOCATION)
++GET_TARGET_PROPERTY(CMD cmake28 LOCATION)
+ ADD_CUSTOM_COMMAND(
+- OUTPUT ${CMake_BINARY_DIR}/Docs/cmake.txt
++ OUTPUT ${CMake_BINARY_DIR}/Docs/cmake28.txt
+ COMMAND ${CMD}
+ 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
+- --help-full ${CMake_BINARY_DIR}/Docs/cmake.docbook
+- --help-policies ${CMake_BINARY_DIR}/Docs/cmake-policies.txt
+- --help-policies ${CMake_BINARY_DIR}/Docs/cmake-policies.html
+- --help-policies ${CMake_BINARY_DIR}/Docs/cmakepolicies.1
+- --help-properties ${CMake_BINARY_DIR}/Docs/cmake-properties.txt
+- --help-properties ${CMake_BINARY_DIR}/Docs/cmake-properties.html
+- --help-properties ${CMake_BINARY_DIR}/Docs/cmakeprops.1
+- --help-variables ${CMake_BINARY_DIR}/Docs/cmake-variables.txt
+- --help-variables ${CMake_BINARY_DIR}/Docs/cmake-variables.html
+- --help-variables ${CMake_BINARY_DIR}/Docs/cmakevars.1
+- --help-modules ${CMake_BINARY_DIR}/Docs/cmake-modules.txt
+- --help-modules ${CMake_BINARY_DIR}/Docs/cmake-modules.html
+- --help-modules ${CMake_BINARY_DIR}/Docs/cmakemodules.1
+- --help-commands ${CMake_BINARY_DIR}/Docs/cmake-commands.txt
+- --help-commands ${CMake_BINARY_DIR}/Docs/cmake-commands.html
+- --help-commands ${CMake_BINARY_DIR}/Docs/cmakecommands.1
+- --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.txt
+- --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html
+- --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmakecompat.1
+- DEPENDS cmake
++ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.txt
++ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.html
++ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.1
++ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.docbook
++ --help-policies ${CMake_BINARY_DIR}/Docs/cmake28-policies.txt
++ --help-policies ${CMake_BINARY_DIR}/Docs/cmake28-policies.html
++ --help-policies ${CMake_BINARY_DIR}/Docs/cmake28policies.1
++ --help-properties ${CMake_BINARY_DIR}/Docs/cmake28-properties.txt
++ --help-properties ${CMake_BINARY_DIR}/Docs/cmake28-properties.html
++ --help-properties ${CMake_BINARY_DIR}/Docs/cmake28props.1
++ --help-variables ${CMake_BINARY_DIR}/Docs/cmake28-variables.txt
++ --help-variables ${CMake_BINARY_DIR}/Docs/cmake28-variables.html
++ --help-variables ${CMake_BINARY_DIR}/Docs/cmake28vars.1
++ --help-modules ${CMake_BINARY_DIR}/Docs/cmake28-modules.txt
++ --help-modules ${CMake_BINARY_DIR}/Docs/cmake28-modules.html
++ --help-modules ${CMake_BINARY_DIR}/Docs/cmake28modules.1
++ --help-commands ${CMake_BINARY_DIR}/Docs/cmake28-commands.txt
++ --help-commands ${CMake_BINARY_DIR}/Docs/cmake28-commands.html
++ --help-commands ${CMake_BINARY_DIR}/Docs/cmake28commands.1
++ --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake28-compatcommands.txt
++ --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake28-compatcommands.html
++ --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake28compat.1
++ DEPENDS cmake28
+ MAIN_DEPENDENCY ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt
+ )
+
+ INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES ${MAN_FILES})
+ INSTALL_FILES(${CMAKE_DOC_DIR} FILES ${HTML_FILES} ${TEXT_FILES})
+-INSTALL(FILES cmake.m4 DESTINATION share/aclocal)
++INSTALL(FILES cmake.m4 DESTINATION share/aclocal RENAME cmake28.m4)
+
+ # Drive documentation generation.
+-ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake.txt )
++ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake28.txt )
+
+ # Documentation testing.
+ if(BUILD_TESTING)
diff --git a/cmake28.spec b/cmake28.spec
new file mode 100644
index 0000000..b07d669
--- /dev/null
+++ b/cmake28.spec
@@ -0,0 +1,544 @@
+# Set to bcond_without or use --with bootstrap if bootstrapping a new release
+# or architecture
+%bcond_with bootstrap
+# 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 %{nil}
+
+Name: cmake28
+Version: 2.8.8
+Release: 4%{?dist}
+Summary: Cross-platform make system
+
+Group: Development/Tools
+
+# Most sources are BSD. Source/CursesDialog/form/ a bunch is MIT.
+# Source/kwsys/MD5.c is bundled(md5-deutsch) and zlib licensed. Some
+# GPL-licensed bison-generated files, these all include an exception
+# granting redistribution under terms of your choice
+License: BSD and MIT and zlib
+URL: http://www.cmake.org
+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
+
+# Source/kwsys/MD5.c
+# see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries
+Provides: bundled(md5-deutsch)
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gcc-gfortran
+BuildRequires: ncurses-devel, libX11-devel
+BuildRequires: bzip2-devel
+BuildRequires: curl-devel
+BuildRequires: expat-devel
+BuildRequires: libarchive-devel
+BuildRequires: zlib-devel
+%if %{without bootstrap}
+#BuildRequires: xmlrpc-c-devel
+%endif
+%if %{with gui}
+BuildRequires: qt4-devel, desktop-file-utils
+%define qt_gui --qt-gui
+%endif
+Requires: rpm
+
+
+%description
+CMake is used to control the software compilation process using simple
+platform and compiler independent configuration files. CMake generates
+native makefiles and workspaces that can be used in the compiler
+environment of your choice. CMake is quite sophisticated: it is possible
+to support complex environments requiring system configuration, preprocessor
+generation, code generation, and template instantiation.
+
+
+%package gui
+Summary: Qt GUI for %{name}
+Group: Development/Tools
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description gui
+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
+
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+mkdir build
+pushd build
+../bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
+ --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
+ --%{?with_bootstrap:no-}system-libs \
+ --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
+ %{?qt_gui}
+make VERBOSE=1 %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+pushd build
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT/%{_datadir}/%{name}/Modules -type f | xargs chmod -x
+popd
+cp -a Example $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/cmake28
+install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/cmake28/cmake28-mode.el
+# RPM macros
+install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake28
+sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake28
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake28
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+
+%if %{with gui}
+# Desktop file
+desktop-file-install --delete-original \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}/%{_datadir}/applications/CMake28.desktop
+%endif
+
+
+%check
+unset DISPLAY
+pushd build
+#ModuleNotices fails for some unknown reason, and we don't care
+#CMake.HTML currently requires internet access
+#CTestTestUpload requires internet access
+# Currently broken - disable for now
+bin/ctest28 -V -E ModuleNotices -E CMake.HTML -E CTestTestUpload %{?_smp_mflags}
+popd
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%if %{with gui}
+%post gui
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun gui
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+%endif
+
+
+%files
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/rpm/macros.cmake28
+%{_docdir}/%{name}-%{version}/
+%if %{with gui}
+%exclude %{_docdir}/%{name}-%{version}/cmake28-gui.*
+%endif
+%{_bindir}/ccmake28
+%{_bindir}/cmake28
+%{_bindir}/cpack28
+%{_bindir}/ctest28
+%{_datadir}/aclocal/cmake28.m4
+%{_datadir}/%{name}/
+%{_mandir}/man1/*
+%exclude %{_mandir}/man1/cmake28-gui.1.gz
+%{_datadir}/emacs/site-lisp/cmake28
+%{_libdir}/%{name}/
+
+%if %{with gui}
+%files gui
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}/cmake28-gui.*
+%{_bindir}/cmake28-gui
+%{_datadir}/applications/CMake28.desktop
+%{_datadir}/mime/packages/cmake28cache.xml
+%{_datadir}/pixmaps/CMake28Setup32.png
+%{_mandir}/man1/cmake28-gui.1.gz
+%endif
+
+
+%changelog
+* 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)
+
+* Wed May 9 2012 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.8.8-3
+- Corrected spec file License tag
+
+* Tue May 8 2012 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.8.8-2
+- Initial package, based on the cmake package
+- Some fixes to macros.cmake28
+- White space fixes to spec file
+- Make -gui require arch specific main package
+
+* Thu Apr 19 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-1
+- Update to 2.8.8 final
+
+* Sat Apr 14 2012 Rex Dieter <rdieter at fedoraproject.org> 2.8.8-0.4.rc2
+- adjust pkgconfig patch (#812188)
+
+* Fri Apr 13 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-0.3.rc2
+- Add upstream patch to set PKG_CONFIG_FOUND (bug #812188)
+
+* Mon Apr 9 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-0.2.rc2
+- Update to 2.8.8 RC 2
+
+* Fri Mar 23 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-0.1.rc1
+- Update to 2.8.8 RC 1
+
+* Tue Feb 21 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.7-6
+- Just strip CMAKE_INSTALL_LIBDIR from %%cmake macro
+
+* Tue Feb 21 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.7-5
+- Strip CMAKE_INSTALL_LIBDIR and others from %%cmake macro (bug 795542)
+
+* Thu Jan 26 2012 Tomas Bzatek <tbzatek at redhat.com> - 2.8.7-4
+- Rebuilt for new libarchive
+
+* Wed Jan 17 2012 Jaroslav Reznik <jreznik at redhat.com> - 2.8.7-3
+- Rebuild for libarchive
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sun Jan 1 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.7-1
+- Update to 2.8.7 final
+
+* Tue Dec 27 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.7-0.2.rc2
+- Update to 2.8.7 RC 2
+
+* Tue Dec 13 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.7-0.1.rc1
+- Update to 2.8.7 RC 1
+
+* Tue Nov 15 2011 Daniel Drake <dsd at laptop.org> - 2.8.6-2
+- Rebuild for libarchive.so.11
+
+* Wed Oct 5 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.6-1
+- Update to 2.8.6 final
+
+* Thu Sep 22 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.6-0.5.rc4
+- Update to 2.8.6 RC 4
+
+* Tue Sep 13 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.6-0.4.rc3
+- Update to 2.8.6 RC 3
+
+* Sun Sep 11 2011 Ville Skyttä <ville.skytta at iki.fi> - 2.8.6-0.3.rc2
+- Sync FFLAGS and LDFLAGS in the %%cmake macro with redhat-rpm-config.
+
+* Tue Sep 6 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.6-0.2.rc2
+- Update to 2.8.6 RC 2
+- Drop aclocal patch
+
+* Mon Aug 29 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.6-0.1.rc1
+- Update to 2.8.6 RC 1
+- Update dcmtk patch
+- Add upstream patch to fix aclocal install location
+
+* Thu Jul 28 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-3
+- Updated patch to find dcmtk in Fedora (Bug #720140)
+
+* Fri Jul 22 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-2
+- Add patch to find dcmtk in Fedora (Bug #720140)
+
+* Fri Jul 22 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-1
+- Update to 2.8.5 final
+- Drop issue 12307 patch
+
+* Thu Jul 21 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-0.3.rc3
+- Update to 2.8.5 RC 3
+- Drop upstreamed swig patch
+- Apply upstream fix for issue 12307 (bug #723652)
+
+* Mon Jun 20 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-0.2.rc2
+- Update to 2.8.5 RC 2
+- Add patch from upstream to fix FindSWIG
+
+* Tue May 31 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-0.1.rc1
+- Update to 2.8.5 RC 1
+- Disable CTestTestUpload test, needs internet access
+
+* Thu Feb 17 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.4-1
+- Update to 2.8.4 final
+
+* Wed Feb 2 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.4-0.2.rc2
+- Update to 2.8.4 RC 2
+
+* Tue Jan 18 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.4-0.1.rc1
+- Update to 2.8.4 RC 1
+- Drop qt4 patch
+
+* Thu Dec 16 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.3-2
+- Add patch from upstream git to fix bug 652886 (qt3/qt4 detection)
+
+* Thu Nov 4 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.3-1
+- Update to 2.8.3 final
+
+* Mon Nov 1 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.3-0.3.rc4
+- Update to 2.8.3 RC 4
+- Drop python 2.7 patch fixed upstream
+- No need to fixup source file permissions anymore
+
+* Fri Oct 22 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.3-0.2.rc3
+- Update to 2.8.3 RC 3
+
+* Thu Sep 16 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.3-0.1.rc1
+- Update to 2.8.3 RC 1
+- Add BR bzip2-devel and libarchive-devel
+
+* Fri Jul 23 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.8.2-2
+- add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil)
+
+* Tue Jul 6 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.2-1
+- Update to 2.8.2 final
+
+* Thu Jun 23 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.2-0.3.rc4
+- Update to 2.8.2 RC 4
+
+* Wed Jun 23 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.2-0.2.rc3
+- Update to 2.8.2 RC 3
+
+* Mon Jun 21 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.2-0.1.rc2
+- Update to 2.8.2 RC 2
+
+* Thu Jun 3 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.1-5
+- Upstream published a newer 2.8.1 tar ball
+
+* Wed Jun 2 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.1-4
+- Add BR gcc-gfortran so Fortran support is built
+
+* Wed Apr 21 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.1-3
+- Disable ModuleNotices test, re-enable parallel ctest
+
+* Tue Mar 30 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.1-2
+- Disable parallel ctest checks for now
+
+* Tue Mar 23 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.1-1
+- Update to 2.8.1 final
+
+* Tue Mar 23 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.8.1-0.3.rc5
+- Own /usr/lib(64)/cmake/
+
+* Fri Mar 12 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.1-0.2.rc5
+- Update to 2.8.1 RC 5
+
+* Fri Feb 19 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.1-0.1.rc3
+- Update to 2.8.1 RC 3
+
+* Thu Jan 14 2010 Rex Dieter <rdieter at fedorproject.org> - 2.8.0-2
+- macros.cmake: drop -DCMAKE_SKIP_RPATH:BOOL=ON from %%cmake
+
+* Wed Nov 18 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-1
+- Update to 2.8.0 final
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.8.0-0.8.rc7
+- rebuild (for qt-4.6.0-rc1)
+
+* Wed Nov 11 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.7.rc7
+- Update to 2.8.0 RC 7
+
+* Tue Nov 10 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.7.rc6
+- Update to 2.8.0 RC 6
+
+* Wed Nov 4 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.6.rc5
+- Update to 2.8.0 RC 5
+- Drop patches fixed upstream
+
+* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.5.rc4
+- Update to 2.8.0 RC 4
+- Add FindJNI patch
+- Add test patch from cvs to fix Fedora build test build error
+
+* Tue Oct 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc3
+- Update to 2.8.0 RC 3
+- Drop vtk64 patch fixed upstream
+
+* Fri Oct 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.3.rc2
+- Do out of tree build, needed for ExternalProject test
+
+* Thu Oct 8 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.2.rc2
+- Update to 2.8.0 RC 2
+- Use parallel ctest in %%check
+
+* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc1
+- Update to 2.8.0 RC 1
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.4-4
+- macro.cmake: prefixes cmake with the package being builts bindir (#523878)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 3 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-2
+- Add patch to find VTK on 64-bit machines (bug #503945)
+
+* Wed Apr 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
+- Update to 2.6.4
+- Drop patch for bug #475876 fixed upstream
+
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-3
+- macros.cmake: +%%_cmake_version
+
+* Mon Mar 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.6.3-2
+- Fix crash during kdepimlibs build (#475876)
+
+* Mon Feb 23 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-1
+- Update to 2.6.3 final
+
+* Tue Feb 17 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.4.rc13
+- Update to 2.6.3-RC-13
+
+* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.3.rc8
+- Update to 2.6.3-RC-8
+
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
+- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
+- fix Release tag
+
+* Wed Dec 10 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.rc5.1
+- Update to 2.6.3-RC-5
+
+* Tue Dec 2 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.2-3
+- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053)
+- preserve timestamp of macros.cmake
+- cosmetics
+
+* Tue Oct 21 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-2
+- Allow conditional build of gui
+
+* Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
+- Update to 2.6.2
+
+* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-0.rc3.1
+- Update to 2.6.2-RC-2
+- Drop parens patch fixed upstream
+
+* Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
+- Drop jni patch, applied upstream.
+
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.1-2
+- attempt to patch logic error, crasher
+
+* Tue Aug 5 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-1
+- Update to 2.6.1
+
+* Mon Jul 14 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-0.rc8.1
+- Update to 2.6.1-RC-8
+- Drop xmlrpc patch fixed upstream
+
+* Tue May 6 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-1
+- Update to 2.6.0
+
+* Mon May 5 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc10.1
+- Update to 2.6.0-RC-10
+
+* Thu Apr 24 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc9.1
+- Update to 2.6.0-RC-9
+
+* Fri Apr 11 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc8.1
+- Update to 2.6.0-RC-8
+
+* Thu Apr 3 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc6.1
+- Update to 2.6.0-RC-6
+
+* Fri Mar 28 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc5.1
+- Update to 2.6.0-RC-5
+- Add gui sub-package for Qt frontend
+
+* Fri Mar 7 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.8-3
+- Add macro for bootstrapping new release/architecture
+- Add %%check section
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.4.8-2
+- Autorebuild for GCC 4.3
+
+* Tue Jan 22 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.8-1
+- Update to 2.4.8
+
+* Wed Jan 16 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.8-0.rc12
+- Update to 2.4.8 RC-12
+
+* Fri Dec 14 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.8-0.rc4
+- Update to 2.4.8 RC-4
+
+* Mon Nov 12 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.7-4
+- No longer set CMAKE_SKIP_RPATH
+
+* Tue Aug 28 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.7-3
+- Rebuild for new expat
+
+* Wed Aug 22 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.7-2
+- Rebuild for BuildID
+
+* Mon Jul 23 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.7-1
+- Update to 2.4.7
+
+* Fri Jun 29 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.7-0.rc11
+- Update to 2.4.7 RC-11
+
+* Wed Jun 27 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.6-4
+- Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR,
+ LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX
+
+* Mon Apr 16 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.6-3
+- Apply patch from upstream CVS to fix .so install permissions (bug #235673)
+
+* Fri Apr 06 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.6-2
+- Add rpm macros
+
+* Thu Jan 11 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.6-1
+- Update to 2.4.6
+
+* Mon Dec 18 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.5-2
+- Use system libraries (bootstrap --system-libs)
+
+* Tue Dec 5 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.5-1
+- Update to 2.4.5
+
+* Tue Nov 21 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.4-1
+- Update to 2.4.4
+
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-4
+- Add /usr/lib/jvm/java to FindJNI search paths
+
+* Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
+- Rebuild for FC6
+
+* Wed Aug 2 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-2
+- vim 7.0 now ships cmake files, so don't ship ours (bug #201018)
+- Add patch to Linux.cmake for Fortran soname support for plplot
+
+* Tue Aug 1 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-1
+- Update to 2.4.3
+
+* Mon Jul 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.2-3
+- Update for vim 7.0
+
+* Tue Jul 11 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.2-2
+- Patch FindRuby and FindSWIG to work on Fedora (bug #198103)
+
+* Fri Jun 30 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.2-1
+- Update to 2.4.2
+
+* Thu Apr 6 2006 Orion Poplawski <orion at cora.nwra.com> - 2.2.3-4
+- Update for vim 7.0c
+
+* Tue Mar 28 2006 Orion Poplawski <orion at cora.nwra.com> - 2.2.3-3
+- No subpackages, just own the emacs and vim dirs.
+
+* Tue Mar 21 2006 Orion Poplawski <orion at cora.nwra.com> - 2.2.3-2
+- Add emacs and vim support
+- Include Example in docs
+
+* Wed Mar 8 2006 Orion Poplawski <orion at cora.nwra.com> - 2.2.3-1
+- Fedora Extras version
diff --git a/macros.cmake28 b/macros.cmake28
new file mode 100644
index 0000000..19c907c
--- /dev/null
+++ b/macros.cmake28
@@ -0,0 +1,24 @@
+#
+# Macros for cmake
+#
+%_cmake_lib_suffix64 -DLIB_SUFFIX=64
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
+%_cmake_version @@CMAKE_VERSION@@
+%__cmake28 /usr/bin/cmake28
+
+%cmake28 \
+ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
+ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
+ %__cmake28 \\\
+ -DCMAKE_VERBOSE_MAKEFILE=ON \\\
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
+ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
+ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
+ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
+%if "%{?_lib}" == "lib64" \
+ %{?_cmake_lib_suffix64} \\\
+%endif \
+ -DBUILD_SHARED_LIBS:BOOL=ON
diff --git a/sources b/sources
index e69de29..d4a3eb7 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ba74b22c788a0c8547976b880cd02b17 cmake-2.8.8.tar.gz
More information about the scm-commits
mailing list