rpms/vtk/F-9 vtk.spec,1.9,1.10

[Axel Thimm]

Author: athimm

Update of /cvs/extras/rpms/vtk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6037/vtk/F-9

Modified Files:
	vtk.spec 
Log Message:
%%check || : does not work anymore, enable java by default.


Index: vtk.spec
===================================================================
RCS file: /cvs/extras/rpms/vtk/F-9/vtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vtk.spec	12 Apr 2008 05:42:05 -0000	1.9
+++ vtk.spec	25 Aug 2008 12:06:41 -0000	1.10
@@ -1,14 +1,17 @@
 %bcond_without OSMesa
 %bcond_with qt4
-%bcond_with java
+%bcond_without java
 
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 5.0.4
-Release: 21%{?dist}
-License: BSD-like
+Release: 23%{?dist}
+# This is a variant BSD license, a cross between BSD and ZLIB.
+# For all intents, it has the same rights and restrictions as BSD.
+# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
+License: BSD
 Group: System Environment/Libraries
 Source: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz
 Patch0: vtk-5.0.0-pythondestdir.patch
@@ -102,7 +105,7 @@
 %prep
 %setup -q -n VTK
 %patch0 -p1
-%patch1 -p1
+%patch1 -p1 -b .gcc43
 
 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
 # otherwise it will break on symlinks.
@@ -285,7 +288,7 @@
 # Add exec bits to shared libs ...
 chmod 0755 %{buildroot}%{_libdir}/vtk-5.0/CMake/*.so
 
-%check || :
+%check
 #LD_LIBARARY_PATH=`pwd`/bin ctest -V
 
 %clean
@@ -369,6 +372,13 @@
 %{_libdir}/vtk-examples-5.0
 
 %changelog
+* Sun Aug 24 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.0.4-23
+- %%check || : does not work anymore.
+- enable java by default.
+
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.0.4-22
+- fix license tag
+
 * Sat Apr 12 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.0.4-21
 - Fixes for gcc 4.3 by Orion Poplawski.