From 848a64b6ad7d10e8c10ac62db337ebe3344161e4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 22 Nov 2006 04:15:08 +0000 Subject: [PATCH] Update to 2.4.4 --- .cvsignore | 2 +- cmake-2.4.2-fedora.patch | 26 ---------------- cmake-2.4.3-soname.patch | 64 ---------------------------------------- cmake.spec | 9 +++--- sources | 2 +- 5 files changed, 7 insertions(+), 96 deletions(-) delete mode 100644 cmake-2.4.3-soname.patch diff --git a/.cvsignore b/.cvsignore index 6eb91b2..4b4d5f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cmake-2.4.3.tar.gz +cmake-2.4.4.tar.gz diff --git a/cmake-2.4.2-fedora.patch b/cmake-2.4.2-fedora.patch index a31f236..1064532 100644 --- a/cmake-2.4.2-fedora.patch +++ b/cmake-2.4.2-fedora.patch @@ -1,29 +1,3 @@ ---- cmake-2.4.2/Modules/FindRuby.cmake.fedora 2006-07-11 10:20:14.000000000 -0600 -+++ cmake-2.4.2/Modules/FindRuby.cmake 2006-07-11 10:20:38.000000000 -0600 -@@ -9,6 +9,7 @@ - - SET(RUBY_POSSIBLE_INCLUDE_PATHS -- /usr/lib/ruby/1.8/i386-linux -+ /usr/lib/ruby/*/i386-linux -+ /usr/lib64/ruby/*/x86_64-linux - ) - - SET(RUBY_POSSIBLE_LIB_PATHS -@@ -19,12 +20,12 @@ - ${RUBY_POSSIBLE_INCLUDE_PATHS}) - - FIND_LIBRARY(RUBY_LIBRARY -- NAMES ruby1.8 -+ NAMES ruby - PATHS ${RUBY_POSSIBLE_LIB_PATHS} - ) - - FIND_PROGRAM(RUBY_EXECUTABLE -- NAMES ruby1.8 -+ NAMES ruby - PATHS - /usr/bin - /usr/local/bin --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora 2006-07-11 10:21:11.000000000 -0600 +++ cmake-2.4.2/Modules/FindSWIG.cmake 2006-07-11 10:22:47.000000000 -0600 @@ -7,13 +7,11 @@ diff --git a/cmake-2.4.3-soname.patch b/cmake-2.4.3-soname.patch deleted file mode 100644 index 47b47ac..0000000 --- a/cmake-2.4.3-soname.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- Modules/Platform/Linux.cmake 20 Apr 2006 14:23:17 -0000 1.9 -+++ Modules/Platform/Linux.cmake 1 Aug 2006 19:36:49 -0000 1.10 -@@ -7,4 +7,5 @@ - SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") - SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") - SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") -+SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,") - INCLUDE(Platform/UnixPaths) ---- Source/cmInstallTargetGenerator.cxx 30 Jun 2006 17:48:43 -0000 1.12.2.3 -+++ Source/cmInstallTargetGenerator.cxx 1 Aug 2006 19:36:49 -0000 1.17 -@@ -3,8 +3,8 @@ - Program: CMake - Cross-Platform Makefile Generator - Module: $RCSfile: cmInstallTargetGenerator.cxx,v $ - Language: C++ -- Date: $Date: 2006/06/30 17:48:43 $ -- Version: $Revision: 1.12.2.3 $ -+ Date: $Date: 2006/08/01 19:36:49 $ -+ Version: $Revision: 1.17 $ - - Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. - See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. -@@ -81,16 +81,25 @@ - { - // Add shared library installation properties if this platform - // supports them. -- const char* lib_version = this->Target->GetProperty("VERSION"); -- const char* lib_soversion = this->Target->GetProperty("SOVERSION"); -- if(!this->Target->GetMakefile() -- ->GetDefinition("CMAKE_SHARED_LIBRARY_SONAME_C_FLAG")) -+ const char* lib_version = 0; -+ const char* lib_soversion = 0; -+ -+ // Versioning is supported only for shared libraries and modules, -+ // and then only when the platform supports an soname flag. -+ cmGlobalGenerator* gg = -+ this->Target->GetMakefile()->GetLocalGenerator()->GetGlobalGenerator(); -+ if(const char* linkLanguage = this->Target->GetLinkerLanguage(gg)) - { -- // Versioning is supported only for shared libraries and modules, -- // and then only when the platform supports an soname flag. -- lib_version = 0; -- lib_soversion = 0; -+ std::string sonameFlagVar = "CMAKE_SHARED_LIBRARY_SONAME_"; -+ sonameFlagVar += linkLanguage; -+ sonameFlagVar += "_FLAG"; -+ if(this->Target->GetMakefile()->GetDefinition(sonameFlagVar.c_str())) -+ { -+ lib_version = this->Target->GetProperty("VERSION"); -+ lib_soversion = this->Target->GetProperty("SOVERSION"); -+ } - } -+ - if(lib_version) - { - props += " VERSION "; -@@ -272,7 +281,7 @@ - //---------------------------------------------------------------------------- - void cmInstallTargetGenerator - ::AddInstallNamePatchRule(std::ostream& os, -- const char* destination) -+ const char* destination) - { - // Build a map of build-tree install_name to install-tree install_name for - // shared libraries linked to this target. diff --git a/cmake.spec b/cmake.spec index 273963d..4a0b795 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,6 +1,6 @@ Name: cmake -Version: 2.4.3 -Release: 4%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -9,7 +9,6 @@ URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz Source1: cmake-init-fedora Patch0: cmake-2.4.2-fedora.patch -Patch1: cmake-2.4.3-soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel @@ -25,7 +24,6 @@ generation, code generation, and template instantiation. %prep %setup -q %patch -p1 -b .fedora -%patch1 -p0 -b .soname %build @@ -62,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 21 2006 Orion Poplawski - 2.4.4-1 +- Update to 2.4.4 + * Tue Oct 31 2006 Orion Poplawski - 2.4.3-4 - Add /usr/lib/jvm/java to FindJNI search paths diff --git a/sources b/sources index 9484cf2..b5c5504 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9b50c488a24edd5297ffc3230ecd0f2 cmake-2.4.3.tar.gz +8c99af9e6e70f154314cf0d160b61e6e cmake-2.4.4.tar.gz