From b6d7b892518ddcb7717aa4490792b144c6ccc67c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 15 Mar 2013 20:42:58 -0600 Subject: [PATCH] - Update to 2.8.11-rc1 - Drop upstream ccmake and usrmove patches --- .gitignore | 1 + cmake-ccmake-del-in-first-column.patch | 14 ------ cmake-usrmove.patch | 60 -------------------------- cmake.spec | 19 +++----- sources | 2 +- 5 files changed, 9 insertions(+), 87 deletions(-) delete mode 100644 cmake-ccmake-del-in-first-column.patch delete mode 100644 cmake-usrmove.patch diff --git a/.gitignore b/.gitignore index 923b985..f1199cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cmake-2.8.8.tar.gz /cmake-2.8.9.tar.gz /cmake-2.8.10.2.tar.gz +/cmake-2.8.11-rc1.tar.gz diff --git a/cmake-ccmake-del-in-first-column.patch b/cmake-ccmake-del-in-first-column.patch deleted file mode 100644 index 5d30142..0000000 --- a/cmake-ccmake-del-in-first-column.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-usrmove.patch b/cmake-usrmove.patch deleted file mode 100644 index a9125ab..0000000 --- a/cmake-usrmove.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up cmake-2.8.10.2/Source/cmExportInstallFileGenerator.cxx.usrmove cmake-2.8.10.2/Source/cmExportInstallFileGenerator.cxx ---- cmake-2.8.10.2/Source/cmExportInstallFileGenerator.cxx.usrmove 2012-11-27 06:26:33.000000000 -0700 -+++ cmake-2.8.10.2/Source/cmExportInstallFileGenerator.cxx 2013-03-13 14:13:56.554281710 -0600 -@@ -149,17 +149,35 @@ cmExportInstallFileGenerator - const char* installDest = this->IEGen->GetDestination(); - if(!cmSystemTools::FileIsFullPath(installDest)) - { -- std::string dest = installDest; -- os << "# Compute the installation prefix relative to this file.\n" -- << "GET_FILENAME_COMPONENT(_IMPORT_PREFIX " -- << "\"${CMAKE_CURRENT_LIST_FILE}\" PATH)\n"; -- while(!dest.empty()) -+ std::string installPrefix = -+ this->IEGen->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX"); -+ std::string absDest = installPrefix + "/" + installDest + "/"; -+ if(strncmp(absDest.c_str(), "/lib/", 5) == 0 || -+ strncmp(absDest.c_str(), "/lib64/", 7) == 0 || -+ strncmp(absDest.c_str(), "/usr/lib/", 9) == 0 || -+ strncmp(absDest.c_str(), "/usr/lib64/", 11) == 0) - { -- os << -- "GET_FILENAME_COMPONENT(_IMPORT_PREFIX \"${_IMPORT_PREFIX}\" PATH)\n"; -- dest = cmSystemTools::GetFilenamePath(dest); -+ // Assume this is a build for system package installation rather than a -+ // relocatable distribution. Use an absolute prefix because some Linux -+ // distros symlink /lib to /usr/lib which confuses the relative path -+ // computation below if we generate for /lib under one prefix and but the -+ // file is loaded from another. -+ os << "set(_IMPORT_PREFIX \"" << installPrefix << "\")\n"; -+ } -+ else -+ { -+ std::string dest = installDest; -+ os << "# Compute the installation prefix relative to this file.\n" -+ << "get_filename_component(_IMPORT_PREFIX " -+ << "\"${CMAKE_CURRENT_LIST_FILE}\" PATH)\n"; -+ while(!dest.empty()) -+ { -+ os << -+ "get_filename_component(_IMPORT_PREFIX \"${_IMPORT_PREFIX}\" PATH)\n"; -+ dest = cmSystemTools::GetFilenamePath(dest); -+ } -+ os << "\n"; - } -- os << "\n"; - - // Import location properties may reference this variable. - this->ImportPrefix = "${_IMPORT_PREFIX}/"; -diff -up cmake-2.8.10.2/Source/cmInstallExportGenerator.h.usrmove cmake-2.8.10.2/Source/cmInstallExportGenerator.h ---- cmake-2.8.10.2/Source/cmInstallExportGenerator.h.usrmove 2012-11-27 06:26:33.000000000 -0700 -+++ cmake-2.8.10.2/Source/cmInstallExportGenerator.h 2013-03-13 14:11:17.972077264 -0600 -@@ -36,6 +36,8 @@ public: - - cmExportSet* GetExportSet() {return this->ExportSet;} - -+ cmMakefile* GetMakefile() const { return this->Makefile; } -+ - const std::string& GetNamespace() const { return this->Namespace; } - - protected: diff --git a/cmake.spec b/cmake.spec index f84ca87..c4cc6cf 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 -rc1 Name: cmake -Version: 2.8.10.2 -Release: 5%{?dist} +Version: 2.8.11 +Release: 0.1.rc1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -33,13 +33,6 @@ 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 -# Upstream patch to use absolute paths to fix UsrMove handling -# https://bugzilla.redhat.com/show_bug.cgi?id=917407 -Patch5: cmake-usrmove.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran @@ -92,8 +85,6 @@ The %{name}-gui package contains the Qt based GUI for CMake. %patch1 -p1 -b .ninja %patch2 -p1 -b .findruby %patch3 -p1 -b .findpostgresql -%patch4 -p1 -b .ccmake-del -%patch5 -p1 -b .usrmove %build @@ -190,6 +181,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Fri Mar 14 2013 Orion Poplawski - 2.8.11-0.1.rc1 +- Update to 2.8.11-rc1 +- Drop upstream ccmake and usrmove patches + * Wed Mar 13 2013 Orion Poplawski - 2.8.10.2-5 - Add patch from upstream to fix UsrMove handling (bug #917407) - Drop %%config from rpm macros diff --git a/sources b/sources index 2e99b89..18cfeec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -097278785da7182ec0aea8769d06860c cmake-2.8.10.2.tar.gz +64090a9f01356590ce16aa302439c55d cmake-2.8.11-rc1.tar.gz