rpms/vtk/devel vtk-5.2.0-pythondestdir.patch, 1.2, 1.3 vtk.spec, 1.21, 1.22 vtk-5.2.1-pythondestdir.patch, 1.1, NONE

[athimm]

Author: athimm

Update of /cvs/extras/rpms/vtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25778/devel

Modified Files:
	vtk.spec 
Added Files:
	vtk-5.2.0-pythondestdir.patch 
Removed Files:
	vtk-5.2.1-pythondestdir.patch 
Log Message:
Update to 5.4.2, undo some breakage in recent specfiles.

vtk-5.2.0-pythondestdir.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: vtk-5.2.0-pythondestdir.patch
===================================================================
RCS file: vtk-5.2.0-pythondestdir.patch
diff -N vtk-5.2.0-pythondestdir.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vtk-5.2.0-pythondestdir.patch	23 Jul 2009 05:28:21 -0000	1.3
@@ -0,0 +1,11 @@
+--- VTK/Wrapping/Python/CMakeLists.txt.pythondestdir	2008-05-03 21:34:42.000000000 +0200
++++ VTK/Wrapping/Python/CMakeLists.txt	2008-10-05 11:15:44.000000000 +0200
+@@ -348,7 +348,7 @@
+  
+     # Create default python setup arguments if they are not set.
+     IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
+-      SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
++      SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
+         CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
+       MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
+     ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)


Index: vtk.spec
===================================================================
RCS file: /cvs/extras/rpms/vtk/devel/vtk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- vtk.spec	18 Jun 2009 18:36:55 -0000	1.21
+++ vtk.spec	23 Jul 2009 05:28:21 -0000	1.22
@@ -7,14 +7,14 @@
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 5.4.2
-Release: 31%{?dist}
+Release: 33%{?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.4/%{name}-%{version}.tar.gz
-Patch0: vtk-5.2.1-pythondestdir.patch
+Patch0: vtk-5.2.0-pythondestdir.patch
 Patch1: vtk-5.2.0-gcc43.patch
 URL: http://vtk.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -194,8 +194,8 @@ cmake_command="cmake . \
  -DVTK_USE_QVTK=ON \
 %if %{with qt4}
  -DDESIRED_QT_VERSION=4 \
- -DQT_MOC_EXECUTABLE=%{_libdir}/qt4/bin/moc \
- -DVTK_INSTALL_QT_DIR=`qmake-qt4 -query QT_INSTALL_PREFIX`/plugins/designer \
+ -DQT_MOC_EXECUTABLE=`pkg-config --variable=moc_location QtCore` \
+ -DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \
 %else
  -DDESIRED_QT_VERSION:STRING=3 \
  -DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \
@@ -230,6 +230,7 @@ if [ "%{_lib}" != lib -a "`ls %{buildroo
   mkdir -p %{buildroot}%{_libdir}
   mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/
 fi
+mv %{buildroot}%{_libdir}/vtk-5.4/lib*.so* %{buildroot}%{_libdir}/
 
 # Gather list of non-python/tcl libraries
 ls %{buildroot}%{_libdir}/*.so.* \
@@ -237,8 +238,8 @@ ls %{buildroot}%{_libdir}/*.so.* \
 
 # List of executable utilities
 cat > utils.list << EOF
-vtkParseOGLExt
 vtkEncodeString
+lproj
 EOF
 
 # List of executable examples
@@ -300,7 +301,6 @@ done
 cat libs.list utils.list > main.list
 
 # Make shared libs and scripts executable
-mv %{buildroot}%{_libdir}/vtk-5.4/lib*.so* %{buildroot}%{_libdir}/
 chmod a+x %{buildroot}%{_libdir}/lib*.so.*
 chmod a+x %{buildroot}%{_libdir}/vtk-5.4/doxygen/*.pl
 chmod a+x %{buildroot}%{_libdir}/vtk-5.4/testing/*.{py,tcl}
@@ -315,9 +315,11 @@ find Utilities/Upgrading -type f | xargs
 
 # Add exec bits to shared libs ...
 #chmod 0755 %{buildroot}%{_libdir}/vtk-5.4/CMake/*.so
-# Set proper perms on python shared libs ...
 chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so
 
+# Verdict places the docs in the false folder
+rm -fr %{buildroot}%{_libdir}/vtk-5.4/doc
+
 %check
 #LD_LIBARARY_PATH=`pwd`/bin ctest -V
 
@@ -400,9 +402,6 @@ rm -rf %{buildroot}
 %doc vtk-examples-5.4/Examples
 
 %changelog
-* Thu Jun 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.4.2-31
-- Fix pythondestdir patch file name
-
 * Sat Jun  6 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.4.2-30
 - Update to 5.4.2.
 


--- vtk-5.2.1-pythondestdir.patch DELETED ---