From 3d57928da9a94bf1184be1ab7cc70250eb6467e9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Tue, 26 Aug 2008 20:05:15 +0000
Subject: [PATCH] - attempt to patch logic error, crasher

---
 cmake-2.6.1-parens.patch | 25 +++++++++++++++++++++++++
 cmake.spec               | 15 +++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 cmake-2.6.1-parens.patch

diff --git a/cmake-2.6.1-parens.patch b/cmake-2.6.1-parens.patch
new file mode 100644
index 0000000..c6c32ab
--- /dev/null
+++ b/cmake-2.6.1-parens.patch
@@ -0,0 +1,25 @@
+diff -up cmake-2.6.1/Source/cmELF.cxx.parens cmake-2.6.1/Source/cmELF.cxx
+--- cmake-2.6.1/Source/cmELF.cxx.parens	2008-08-01 10:34:52.000000000 -0500
++++ cmake-2.6.1/Source/cmELF.cxx	2008-08-26 14:58:23.000000000 -0500
+@@ -884,8 +884,8 @@ cmELF::StringEntry const* cmELF::GetSONa
+ cmELF::StringEntry const* cmELF::GetRPath()
+ {
+   if(this->Valid() &&
+-     this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
+-     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)
++     (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
++     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) )
+     {
+     return this->Internal->GetRPath();
+     }
+@@ -899,8 +899,8 @@ cmELF::StringEntry const* cmELF::GetRPat
+ cmELF::StringEntry const* cmELF::GetRunPath()
+ {
+   if(this->Valid() &&
+-     this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
+-     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)
++     (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
++     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) )
+     {
+     return this->Internal->GetRunPath();
+     }
diff --git a/cmake.spec b/cmake.spec
index e3d99e0..9d82f5e 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -4,7 +4,7 @@
 
 Name:           cmake
 Version:        2.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -16,6 +16,11 @@ Source2:        macros.cmake
 #Submitted upstream: http://public.kitware.com/Bug/view.php?id=7333
 Patch0:         cmake-2.6.0-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# fix a crasher, see 
+# http://www.redhat.com/archives/fedora-devel-list/2008-August/msg01145.html
+Patch1:         cmake-2.6.1-parens.patch   
+
 BuildRequires:  ncurses-devel, libX11-devel
 BuildRequires:  qt4-devel, desktop-file-utils
 BuildRequires:  curl-devel, expat-devel, zlib-devel
@@ -43,7 +48,10 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .jni
+
+%patch0 -p1 -b .jni
+%patch1 -p1 -b .parens
+
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -114,6 +122,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> - 2.6.1-2
+- attempt to patch logic error, crasher
+
 * Tue Aug 5 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.1-1
 - Update to 2.6.1