From 1d798ab1d961a075c1391fd20b49940b05af07bb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 24 Oct 2012 19:54:09 -0600 Subject: [PATCH 1/3] Update to 2.8.10 RC 3 Rebase FindRuby and FindPostgreSQL patches --- .gitignore | 1 + cmake-FindPostgreSQL.patch | 34 +++++++++++++++++----------------- cmake-findruby.patch | 16 ++++++++-------- cmake.spec | 10 +++++++--- sources | 2 +- 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index fbde1af..d61bafa 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.9-rc2.tar.gz /cmake-2.8.9-rc3.tar.gz /cmake-2.8.9.tar.gz +/cmake-2.8.10-rc3.tar.gz diff --git a/cmake-FindPostgreSQL.patch b/cmake-FindPostgreSQL.patch index 27315f0..9a4106d 100644 --- a/cmake-FindPostgreSQL.patch +++ b/cmake-FindPostgreSQL.patch @@ -1,6 +1,7 @@ ---- cmake-2.8.8/Modules/FindPostgreSQL.cmake 2012-04-18 20:10:54.000000000 +0200 -+++ cmake-2.8.8/Modules/FindPostgreSQL.cmake 2012-07-04 23:05:30.532090522 +0200 -@@ -97,76 +97,101 @@ set( PostgreSQL_ROOT_DIRECTORIES +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. # @@ -28,12 +29,22 @@ - # 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.") @@ -96,15 +107,6 @@ + fail_if (NOT PostgreSQL_LIBRARY_FOUND) + 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 - NAMES ${PostgreSQL_LIBRARY_TO_FIND} - PATHS @@ -122,10 +124,10 @@ - PostgreSQL_VERSION_STRING "${pgsql_version_str}") - unset(pgsql_version_str) -endif() -+endforeach () ++endforeach() # Did we find anything? --include(FindPackageHandleStandardArgs) +-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) @@ -156,8 +158,6 @@ + message (STATUS "PostgreSQL include dirs: ${PostgreSQL_INCLUDE_DIRS}") + message (STATUS "PostgreSQL library dirs: ${PostgreSQL_LIBRARY_DIRS}") + 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_CONFIG_DIR PostgreSQL_LIB_DIR -+ PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR) diff --git a/cmake-findruby.patch b/cmake-findruby.patch index adbfdd7..6c60931 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,20 +1,20 @@ -diff -up cmake-2.8.8/Modules/FindRuby.cmake.findruby cmake-2.8.8/Modules/FindRuby.cmake ---- cmake-2.8.8/Modules/FindRuby.cmake.findruby 2012-04-18 12:10:54.000000000 -0600 -+++ cmake-2.8.8/Modules/FindRuby.cmake 2012-05-21 10:36:19.206076083 -0600 -@@ -92,14 +92,8 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSIO +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'" +- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" - 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("vendorarchdir" RUBY_VENDORARCH_DIR) -- ENDIF(RUBY_HAS_VENDOR_RUBY) +- 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) + set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) diff --git a/cmake.spec b/cmake.spec index b909b64..0269b00 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 %{nil} +%define rcver -rc3 Name: cmake -Version: 2.8.9 -Release: 1%{?dist} +Version: 2.8.10 +Release: 0.1.rc3%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -177,6 +177,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Wed Oct 24 2012 Orion Poplawski - 2.8.10-0.1.rc3 +- Update to 2.8.10 RC 3 +- Rebase FindRuby and FindPostgreSQL patches + * Thu Aug 9 2012 Orion Poplawski - 2.8.9-1 - Update to 2.8.9 final diff --git a/sources b/sources index 9ad22f2..79ed2c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -801f4c87f8b604f727df5bf1f05a59e7 cmake-2.8.9.tar.gz +a0d794632556d64db3ad180503000e85 cmake-2.8.10-rc3.tar.gz From dfcce6627e8ceef63d8d47f4ecd6abf72339443f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 25 Oct 2012 10:05:59 -0600 Subject: [PATCH 2/3] Add patch to fix DEL key in ccmake (bug 869769) --- cmake-ccmake-del-in-first-column.patch | 14 ++++++++++++++ cmake.spec | 10 +++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 cmake-ccmake-del-in-first-column.patch diff --git a/cmake-ccmake-del-in-first-column.patch b/cmake-ccmake-del-in-first-column.patch new file mode 100644 index 0000000..5d30142 --- /dev/null +++ b/cmake-ccmake-del-in-first-column.patch @@ -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); + } + diff --git a/cmake.spec b/cmake.spec index 0269b00..a7232c7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.10 -Release: 0.1.rc3%{?dist} +Release: 0.2.rc3%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -30,6 +30,10 @@ Patch2: cmake-findruby.patch # https://bugzilla.redhat.com/show_bug.cgi?id=828467 # http://public.kitware.com/Bug/view.php?id=13378 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) BuildRequires: gcc-gfortran @@ -81,6 +85,7 @@ The %{name}-gui package contains the Qt based GUI for CMake. %patch0 -p1 -b .dcmtk %patch2 -p1 -b .findruby %patch3 -p1 -b .findpostgresql +%patch4 -p1 -b .ccmake-del %build @@ -177,6 +182,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Oct 24 2012 Orion Poplawski - 2.8.10-0.2.rc3 +- Add patch to fix DEL key in ccmake (bug 869769) + * Wed Oct 24 2012 Orion Poplawski - 2.8.10-0.1.rc3 - Update to 2.8.10 RC 3 - Rebase FindRuby and FindPostgreSQL patches From 498ec5ea5bcab633aa9d86063f9443ae4d8bad53 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Nov 2012 16:30:14 -0600 Subject: [PATCH 3/3] Update to 2.8.10 final --- .gitignore | 1 + cmake.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d61bafa..e77dc64 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.9-rc3.tar.gz /cmake-2.8.9.tar.gz /cmake-2.8.10-rc3.tar.gz +/cmake-2.8.10.tar.gz diff --git a/cmake.spec b/cmake.spec index a7232c7..6993a17 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.10 -Release: 0.2.rc3%{?dist} +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -182,6 +182,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Nov 1 2012 Orion Poplawski - 2.8.10-1 +- Update to 2.8.10 final + * Thu Oct 24 2012 Orion Poplawski - 2.8.10-0.2.rc3 - Add patch to fix DEL key in ccmake (bug 869769) diff --git a/sources b/sources index 79ed2c8..eae2cd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0d794632556d64db3ad180503000e85 cmake-2.8.10-rc3.tar.gz +d4aef1eab859df61d2664721a72732c0 cmake-2.8.10.tar.gz