From 2e1087b78536e9e6cefe6c98589d441ba043a7c15290280b7a6b9469b3263045 Mon Sep 17 00:00:00 2001
From: Werner Hoch <werner.ho@gmx.de>
Date: Sat, 3 Jan 2009 18:58:54 +0000
Subject: [PATCH] fixed some issues

OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=7
---
 vtk.spec | 46 +++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/vtk.spec b/vtk.spec
index 3e93901..4d81a9c 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -69,7 +69,7 @@ Qt VTK widget
 
 %package examples
 Summary:	Examples for VTK
-Requires:	vtk = %{version}, vtk-data = %{version}
+Requires:	vtk = %{version}, vtkdata = %{version}
 Group:		Applications/Engineering
 
 %description examples
@@ -79,37 +79,22 @@ programming languages
 
 %package testing-progs
 Summary:	Testing programs for VTK
-Requires:	%{name} = %{version}, vtk-data = %{version}
+Requires:	%{name} = %{version}, vtkdata = %{version}
 Group:		Applications/Engineering
 
 %description testing-progs
 Testing programs for VTK
 
-%package data
-Summary:	Data for VTK
-Requires:	vtk = %{version}
-Group:		Development/Libraries
 
-%description data 
-Example data file for VTK
-
-%package doc
-Summary:	Documentation for VTK
-Requires:	vtk = %{version}
-Group:		Development/Libraries
-
-%description doc
-This package contains the doxygen-generated documentation from the VTK
-source
 
 %prep
 %setup -n VTK -q
 %patch0 -p1
 
-# Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
+# Replace relative path ../../../VTKData with %{_datadir}/vtkdata
 # otherwise it will break on symlinks.
 grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \
-  perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{name}-data,g'
+  perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{name}data,g'
 
 %build
 cmake . \
@@ -148,6 +133,9 @@ make %{_smp_mflags}
 %install
 make install
 
+# python stuff is installed in the wrong directory /usr/local
+mv $RPM_BUILD_ROOT%{_prefix}/local/%{_lib}/python* $RPM_BUILD_ROOT%{_libdir}/
+
 # install testing-progs and examples
 find bin -type f | egrep -v '\.' > bin-progs-list
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -193,16 +181,16 @@ install -d $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}/testing
 mv $RPM_BUILD_ROOT/%{_libdir}/*.cmake $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
 mv $RPM_BUILD_ROOT/%{_libdir}/CMake/* $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}/CMake
 mv $RPM_BUILD_ROOT/%{_libdir}/hints $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
-mv $RPM_BUILD_ROOT/%{_libdir}/pkgIndex.tcl $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
-mv $RPM_BUILD_ROOT/%{_libdir}/testing $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
-mv $RPM_BUILD_ROOT/%{_libdir}/tcl $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
+#mv $RPM_BUILD_ROOT/%{_libdir}/pkgIndex.tcl $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
+#mv $RPM_BUILD_ROOT/%{_libdir}/testing $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
+#mv $RPM_BUILD_ROOT/%{_libdir}/tcl $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
 
 # remove doxygen scripts and 
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/doxygen
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/doc
 
 # make scripts executable
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/vtk-%{lib_ver}/testing/*.{py,tcl}
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/testing/*.{py,tcl}
 
 # Remove exec bit from not-scripts
 for file in `find $RPM_BUILD_ROOT Utilities/Upgrading -type f -perm 0755 | xargs -r file  | grep ASCII | awk -F: '{print $1}'`; do
@@ -315,27 +303,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tcl
 %defattr(-,root,root,-)
-%dir %{_libdir}/vtk-%{lib_ver}/testing
+%dir %{_libdir}/testing
 %{_bindir}/vtkWrapTcl
 %{_bindir}/vtkWrapTclInit
 %{_libdir}/libvtk*TCL.so.*
 %{_bindir}/vtk
-%{_libdir}/vtk-%{lib_ver}/tcl
-%{_libdir}/vtk-%{lib_ver}/testing/*.tcl
-%{_libdir}/vtk-%{lib_ver}/pkgIndex.tcl
+%{_libdir}/tcl
+%{_libdir}/testing/*.tcl
+%{_libdir}/pkgIndex.tcl
 
 %doc README.html 
 %doc vtkLogo.jpg
 
 %files python
 %defattr(-,root,root,-)
-%dir %{_libdir}/vtk-%{lib_ver}/testing
+%dir %{_libdir}/testing
 %{_bindir}/vtkWrapPython
 %{_bindir}/vtkWrapPythonInit
 %{_bindir}/vtkpython
 %{_libdir}/libvtk*Python*.so.*
 %{py_sitedir}/*
-%{_libdir}/vtk-%{lib_ver}/testing/*.py
+%{_libdir}/testing/*.py
 
 
 %files qt