From 13c089841e0598e49f589bfb47447c180adaf4b0 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Thu, 3 Apr 2008 22:59:09 +0000
Subject: [PATCH] - Update to 2.6.0-RC-6

---
 .cvsignore                   |  2 +-
 cmake-2.6.0-systemlibs.patch |  7 -------
 cmake.spec                   | 14 ++++++++------
 sources                      |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 cmake-2.6.0-systemlibs.patch

diff --git a/.cvsignore b/.cvsignore
index bcef473..83dafc8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cmake-2.6.0-RC-5.tar.gz
+cmake-2.6.0-RC-6.tar.gz
diff --git a/cmake-2.6.0-systemlibs.patch b/cmake-2.6.0-systemlibs.patch
deleted file mode 100644
index bbe0b2a..0000000
--- a/cmake-2.6.0-systemlibs.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- cmake-2.6.0-RC-5/Source/CMakeLists.txt.systemlibs	2008-03-27 10:08:21.000000000 -0600
-+++ cmake-2.6.0-RC-5/Source/CMakeLists.txt	2008-03-28 11:47:10.000000000 -0600
-@@ -1,3 +1,4 @@
-+INCLUDE(CheckIncludeFile) 
- # Check if we can build support for ELF parsing.
- CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H)
- IF(HAVE_ELF_H)
diff --git a/cmake.spec b/cmake.spec
index 6097dec..3331e86 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -4,20 +4,19 @@
 
 Name:           cmake
 Version:        2.6.0
-Release:        0.rc5.1%{?dist}
+Release:        0.rc6.1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.cmake.org
-Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}-RC-5.tar.gz
+Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}-RC-6.tar.gz
 Source2:        macros.cmake
 Patch0:         cmake-2.6.0-jni.patch
 Patch1:         cmake-2.4.5-xmlrpc.patch
-Patch2:         cmake-2.6.0-systemlibs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
-BuildRequires:  qt-devel, desktop-file-utils
+BuildRequires:  qt4-devel, desktop-file-utils
 BuildRequires:  curl-devel, expat-devel, zlib-devel
 %{?!with_bootstrap:BuildRequires: xmlrpc-c-devel}
 Requires:       rpm
@@ -42,10 +41,9 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 
 %prep
-%setup -q -n %{name}-%{version}-RC-5
+%setup -q -n %{name}-%{version}-RC-6
 %patch -p1 -b .jni
 %patch1 -p1 -b .xmlrpc
-%patch2 -p1 -b .systemlibs
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -78,6 +76,7 @@ desktop-file-install --delete-original \
 
 
 %check
+unset DISPLAY
 bin/ctest -V
 
 
@@ -115,6 +114,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Thu Apr 3 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc6.1
+- Update to 2.6.0-RC-6
+
 * Fri Mar 28 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc5.1
 - Update to 2.6.0-RC-5
 - Add gui sub-package for Qt frontend
diff --git a/sources b/sources
index 0198cc7..aab848a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c7961db5afd732506abafdbcfa904eb  cmake-2.6.0-RC-5.tar.gz
+8213bad7c64d0b7a147aea8d998c2e39  cmake-2.6.0-RC-6.tar.gz