rpms/cmake
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f17

Browse Source 
Update to 2.8.10
This commit is contained in:
Orion Poplawski 2012-11-01 19:45:43 -06:00
commit 406c1c148a
6 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -25,3 +25,5 @@ cmake-2.8.2.tar.gz
/cmake-2.8.9-rc2.tar.gz /cmake-2.8.9-rc2.tar.gz
/cmake-2.8.9-rc3.tar.gz /cmake-2.8.9-rc3.tar.gz
/cmake-2.8.9.tar.gz /cmake-2.8.9.tar.gz
/cmake-2.8.10-rc3.tar.gz
/cmake-2.8.10.tar.gz

34
cmake-FindPostgreSQL.patch
View File

@ -1,6 +1,7 @@
--- cmake-2.8.8/Modules/FindPostgreSQL.cmake 2012-04-18 20:10:54.000000000 +0200 diff -up cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake
+++ cmake-2.8.8/Modules/FindPostgreSQL.cmake 2012-07-04 23:05:30.532090522 +0200 --- cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql 2012-10-24 11:12:01.000000000 -0600
@@ -97,76 +97,101 @@ set( PostgreSQL_ROOT_DIRECTORIES +++ 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. # Look for an installation.
# #
@ -28,12 +29,22 @@
- # Look in other places. - # Look in other places.
- ${PostgreSQL_ROOT_DIRECTORIES} - ${PostgreSQL_ROOT_DIRECTORIES}
- PATH_SUFFIXES - PATH_SUFFIXES
- postgresql
- pgsql/server - pgsql/server
- postgresql/server - postgresql/server
- include/server - include/server
- # Help the user find it if we cannot. - # Help the user find it if we cannot.
- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}" - 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) +macro (fail_if)
+ if (${ARGV}) + if (${ARGV})
+ message (WARNING "Couldn't determine PostgreSQL configuration.") + message (WARNING "Couldn't determine PostgreSQL configuration.")
@ -96,15 +107,6 @@
+ fail_if (NOT PostgreSQL_LIBRARY_FOUND) + fail_if (NOT PostgreSQL_LIBRARY_FOUND)
+ set (PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND}) + set (PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
-# 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 -find_library( PostgreSQL_LIBRARY
- NAMES ${PostgreSQL_LIBRARY_TO_FIND} - NAMES ${PostgreSQL_LIBRARY_TO_FIND}
- PATHS - PATHS
@ -122,10 +124,10 @@
- PostgreSQL_VERSION_STRING "${pgsql_version_str}") - PostgreSQL_VERSION_STRING "${pgsql_version_str}")
- unset(pgsql_version_str) - unset(pgsql_version_str)
-endif() -endif()
+endforeach () +endforeach()
# Did we find anything? # Did we find anything?
-include(FindPackageHandleStandardArgs) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(PostgreSQL -find_package_handle_standard_args(PostgreSQL
- REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR - REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR
- VERSION_VAR PostgreSQL_VERSION_STRING) - VERSION_VAR PostgreSQL_VERSION_STRING)
@ -156,8 +158,6 @@
+ message (STATUS "PostgreSQL include dirs: ${PostgreSQL_INCLUDE_DIRS}") + message (STATUS "PostgreSQL include dirs: ${PostgreSQL_INCLUDE_DIRS}")
+ message (STATUS "PostgreSQL library dirs: ${PostgreSQL_LIBRARY_DIRS}") + message (STATUS "PostgreSQL library dirs: ${PostgreSQL_LIBRARY_DIRS}")
+ message (STATUS "PostgreSQL libraries: ${PostgreSQL_LIBRARIES}") + message (STATUS "PostgreSQL libraries: ${PostgreSQL_LIBRARIES}")
endif(PostgreSQL_FOUND) endif()
-mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR PostgreSQL_LIBRARY ) -mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR PostgreSQL_LIBRARY )
+mark_as_advanced (PostgreSQL_CONFIG_DIR PostgreSQL_LIB_DIR
+ PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR)

14
cmake-ccmake-del-in-first-column.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx
index 5c7414f..bd1ff71 100644
--- a/Source/CursesDialog/cmCursesStringWidget.cxx
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
@@ -175,7 +175,7 @@ bool cmCursesStringWidget::HandleInput(int& key, cmCursesMainForm* fm,
}
else if ( key == ctrl('d') ||key == KEY_DC )
{
- if ( form->curcol > 0 )
+ if ( form->curcol >= 0 )
{
form_driver(form, REQ_DEL_CHAR);
}

16
cmake-findruby.patch
View File

@ -1,20 +1,20 @@
diff -up cmake-2.8.8/Modules/FindRuby.cmake.findruby cmake-2.8.8/Modules/FindRuby.cmake diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake
--- cmake-2.8.8/Modules/FindRuby.cmake.findruby 2012-04-18 12:10:54.000000000 -0600 --- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby 2012-10-02 10:12:18.000000000 -0600
+++ cmake-2.8.8/Modules/FindRuby.cmake 2012-05-21 10:36:19.206076083 -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 @@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
- # vendor_ruby available ? - # vendor_ruby available ?
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" - execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) - OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
- -
- IF(RUBY_HAS_VENDOR_RUBY) - if(RUBY_HAS_VENDOR_RUBY)
- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
- ENDIF(RUBY_HAS_VENDOR_RUBY) - endif()
+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) + _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_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 # 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) set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)

17
cmake.spec
View File

@ -7,7 +7,7 @@
%define rcver %{nil} %define rcver %{nil}
Name: cmake Name: cmake
Version: 2.8.9 Version: 2.8.10
Release: 1%{?dist} Release: 1%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
@ -30,6 +30,10 @@ Patch2: cmake-findruby.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=828467 # https://bugzilla.redhat.com/show_bug.cgi?id=828467
# http://public.kitware.com/Bug/view.php?id=13378 # http://public.kitware.com/Bug/view.php?id=13378
Patch3: cmake-FindPostgreSQL.patch Patch3: cmake-FindPostgreSQL.patch
# Patch to fix ccmake DEL issue
# https://bugzilla.redhat.com/show_bug.cgi?id=869769
# http://public.kitware.com/Bug/view.php?id=13604
Patch4: cmake-ccmake-del-in-first-column.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
@ -81,6 +85,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%patch0 -p1 -b .dcmtk %patch0 -p1 -b .dcmtk
%patch2 -p1 -b .findruby %patch2 -p1 -b .findruby
%patch3 -p1 -b .findpostgresql %patch3 -p1 -b .findpostgresql
%patch4 -p1 -b .ccmake-del
%build %build
@ -177,6 +182,16 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Thu Nov 1 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.10-1
- Update to 2.8.10 final
* Thu Oct 24 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.10-0.2.rc3
- Add patch to fix DEL key in ccmake (bug 869769)
* Wed Oct 24 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.10-0.1.rc3
- Update to 2.8.10 RC 3
- Rebase FindRuby and FindPostgreSQL patches
* Thu Aug 9 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.9-1 * Thu Aug 9 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.9-1
- Update to 2.8.9 final - Update to 2.8.9 final

2
sources
View File

@ -1 +1 @@
801f4c87f8b604f727df5bf1f05a59e7 cmake-2.8.9.tar.gz d4aef1eab859df61d2664721a72732c0 cmake-2.8.10.tar.gz