rpms/cmake/devel .cvsignore, 1.15, 1.16 cmake.spec, 1.32, 1.33 sources, 1.15, 1.16 cmake-2.6.0-systemlibs.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.6.0-systemlibs.patch 
Log Message:
* Thu Apr 3 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc6.1
- Update to 2.6.0-RC-6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	28 Mar 2008 19:32:24 -0000	1.15
+++ .cvsignore	3 Apr 2008 22:59:09 -0000	1.16
@@ -1 +1 @@
-cmake-2.6.0-RC-5.tar.gz
+cmake-2.6.0-RC-6.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cmake.spec	28 Mar 2008 21:33:28 -0000	1.32
+++ cmake.spec	3 Apr 2008 22:59:09 -0000	1.33
@@ -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 @@
 
 
 %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 @@
 
 
 %check
+unset DISPLAY
 bin/ctest -V
 
 
@@ -115,6 +114,9 @@
 
 
 %changelog
+* Thu Apr 3 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc6.1
+- Update to 2.6.0-RC-6
+
 * Fri Mar 28 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc5.1
 - Update to 2.6.0-RC-5
 - Add gui sub-package for Qt frontend


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	28 Mar 2008 19:32:24 -0000	1.15
+++ sources	3 Apr 2008 22:59:09 -0000	1.16
@@ -1 +1 @@
-4c7961db5afd732506abafdbcfa904eb  cmake-2.6.0-RC-5.tar.gz
+8213bad7c64d0b7a147aea8d998c2e39  cmake-2.6.0-RC-6.tar.gz


--- cmake-2.6.0-systemlibs.patch DELETED ---