rpms/cmake
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.8.0 RC 3

Browse Source 
- Drop vtk64 patch fixed upstream
This commit is contained in:
Orion Poplawski 2009-10-13 22:17:43 +00:00
parent 300fbeaee5
commit af13f59319
4 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
cmake-2.8.0-rc2.tar.gz cmake-2.8.0-rc3.tar.gz

18
cmake-2.8.0-vtk64.patch
View File

@ -1,18 +0,0 @@
--- cmake-2.8.0-rc1/Modules/FindVTK.cmake.vtk64 2009-09-25 12:29:20.000000000 -0600
+++ cmake-2.8.0-rc1/Modules/FindVTK.cmake 2009-09-29 10:33:20.506713352 -0600
@@ -45,10 +45,15 @@
SET(VTK_DIR_SEARCH "")
FOREACH(dir ${VTK_DIR_SEARCH2})
SET(VTK_DIR_SEARCH ${VTK_DIR_SEARCH}
+ ${dir}/../lib64/vtk-5.4
${dir}/../lib/vtk-5.4
+ ${dir}/../lib64/vtk-5.2
${dir}/../lib/vtk-5.2
+ ${dir}/../lib64/vtk-5.1
${dir}/../lib/vtk-5.1
+ ${dir}/../lib64/vtk-5.0
${dir}/../lib/vtk-5.0
+ ${dir}/../lib64/vtk
${dir}/../lib/vtk
)
ENDFOREACH(dir)

12
cmake.spec
View File

@ -4,11 +4,11 @@
# Set to bcond_with or use --without gui to disable qt4 gui build # Set to bcond_with or use --without gui to disable qt4 gui build
%bcond_without gui %bcond_without gui
# Set to RC version if building RC, else %{nil} # Set to RC version if building RC, else %{nil}
%define rcver -rc2 %define rcver -rc3
Name: cmake Name: cmake
Version: 2.8.0 Version: 2.8.0
Release: 0.3.rc2%{?dist} Release: 0.4.rc3%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -16,9 +16,6 @@ License: BSD
URL: http://www.cmake.org URL: http://www.cmake.org
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
Source2: macros.cmake Source2: macros.cmake
#Find UseVTK.cmake in /usr/lib64/vtk-* on 64-bit machines
#http://public.kitware.com/mantis/view.php?id=9105
Patch0: cmake-2.8.0-vtk64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel, libX11-devel BuildRequires: ncurses-devel, libX11-devel
@ -53,7 +50,6 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%prep %prep
%setup -q -n %{name}-%{version}%{?rcver} %setup -q -n %{name}-%{version}%{?rcver}
%patch0 -p1 -b .vtk64
# Fixup permissions # Fixup permissions
find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
@ -137,6 +133,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Tue Oct 13 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.4.rc3
- Update to 2.8.0 RC 3
- Drop vtk64 patch fixed upstream
* Fri Oct 9 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.3.rc2 * Fri Oct 9 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.3.rc2
- Do out of tree build, needed for ExternalProject test - Do out of tree build, needed for ExternalProject test

2
sources
View File

@ -1 +1 @@
85c51602dd00184cdc6b15db0164330d cmake-2.8.0-rc2.tar.gz 7cc121a0199affa0697e11fbeefd00c3 cmake-2.8.0-rc3.tar.gz