No longer need cmake28 on RHEL6
This commit is contained in:
parent
3a179aecfd
commit
a1c861aad1
13
vtk.spec
13
vtk.spec
|
@ -9,7 +9,7 @@
|
||||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||||
Name: vtk
|
Name: vtk
|
||||||
Version: 6.1.0
|
Version: 6.1.0
|
||||||
Release: 15%{?dist}
|
Release: 16%{?dist}
|
||||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||||
# For all intents, it has the same rights and restrictions as BSD.
|
# For all intents, it has the same rights and restrictions as BSD.
|
||||||
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
||||||
|
@ -27,11 +27,7 @@ Patch2: vtk-6.1.0-netcdf.patch
|
||||||
|
|
||||||
URL: http://vtk.org/
|
URL: http://vtk.org/
|
||||||
|
|
||||||
%if 0%{?rhel} && (0%{?rhel} <= 6)
|
|
||||||
BuildRequires: cmake28
|
|
||||||
%else
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
%endif
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
#%{?with_java:BuildRequires: gcc-java, libgcj-devel, java-devel}
|
#%{?with_java:BuildRequires: gcc-java, libgcj-devel, java-devel}
|
||||||
%{?with_java:BuildRequires: java-devel}
|
%{?with_java:BuildRequires: java-devel}
|
||||||
|
@ -209,11 +205,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
|
||||||
|
|
||||||
mkdir build
|
mkdir build
|
||||||
pushd build
|
pushd build
|
||||||
%if 0%{?rhel} && (0%{?rhel} <= 6)
|
|
||||||
%{cmake28} .. \
|
|
||||||
%else
|
|
||||||
%{cmake} .. \
|
%{cmake} .. \
|
||||||
%endif
|
|
||||||
-DBUILD_DOCUMENTATION:BOOL=ON \
|
-DBUILD_DOCUMENTATION:BOOL=ON \
|
||||||
-DBUILD_EXAMPLES:BOOL=ON \
|
-DBUILD_EXAMPLES:BOOL=ON \
|
||||||
-DBUILD_TESTING:BOOL=OFF \
|
-DBUILD_TESTING:BOOL=OFF \
|
||||||
|
@ -451,6 +443,9 @@ cp -pr --parents Wrapping/*/README* _docs/
|
||||||
%doc vtk-examples/Examples
|
%doc vtk-examples/Examples
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 31 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-16
|
||||||
|
- No longer need cmake28 on RHEL6
|
||||||
|
|
||||||
* Thu Sep 4 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-15
|
* Thu Sep 4 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-15
|
||||||
- Increase java heap space for builds (bug #1115920)
|
- Increase java heap space for builds (bug #1115920)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue