packages: vtk/vtk.spec, vtk/vtk-cmakefiles.patch (REMOVED)=?UTF-8?Q?=20?=- more build upd...

[qboosh]

Author: qboosh                       Date: Sat Feb 25 11:19:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more build updates; removed obsolete patch

---- Files affected:
packages/vtk:
   vtk.spec (1.13 -> 1.14) , vtk-cmakefiles.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/vtk/vtk.spec
diff -u packages/vtk/vtk.spec:1.13 packages/vtk/vtk.spec:1.14
--- packages/vtk/vtk.spec:1.13	Sat Feb  4 06:22:59 2012
+++ packages/vtk/vtk.spec	Sat Feb 25 12:18:57 2012
@@ -17,7 +17,6 @@
 # Source0-md5:	41382fb3f8d15e76d7464c11045ee7a5
 Source1:	http://downloads.sourceforge.net/vtk/VTKData-4.2.tar.gz
 # Source1-md5:	2bbd1a62884906eac4f279441cbb9cfa
-Patch0:		%{name}-cmakefiles.patch
 URL:		http://www.vtk.org/
 BuildRequires:	XFree86-devel
 BuildRequires:	cmake
@@ -163,9 +162,8 @@
 potrzebne do uruchamiania różnych przykładów z pakietu vtk-examples.
 
 %prep
-%setup -q -n VTK-%{version} -a 1
+%setup -q -n VTK -a 1
 cd Hybrid
-%patch0 -p1
 
 %build
 cmake \
@@ -185,8 +183,7 @@
 %endif
 	-DOPENGL_INCLUDE_PATH:PATH=/usr/include/GL \
 	-DPYTHON_INCLUDE_PATH:PATH=%{py_incdir} \
-	-DPYTHON_LIBRARY:FILEPATH=$(python -c"import os,sys; print os.path.join(sys.exec_prefix, 'lib', 'python' + sys.version
-	[:3], 'config/libpython' + sys.version[:3] + '.a')") \
+	-DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{py_ver}.so \
 	-DPYTHON_UTIL_LIBRARY:PATH=%{_libdir}/libutil.so \
 	-DTCL_INCLUDE_PATH:PATH=%{_includedir} \
 	-DTCL_LIBRARY:PATH=%{_libdir}/libtcl.so \
@@ -212,7 +209,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 #setup python
-export VTKPYTHONPATH=%(python -c"import os,sys; print os.path.join(sys.exec_prefix, 'lib', 'python' + sys.version[:3],'site-packages')")
+export VTKPYTHONPATH=%{py_sitedir}
 
 #install directories
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -283,7 +280,7 @@
 
 # Generate the package testing-progs lists and store them in file-lists
 echo "%defattr (644,root,root,755)" > testing-progs-list
-%if %build_java
+%if %{with java}
 find ${RPM_BUILD_ROOT}/usr/bin -type f | \
 	sed -e "s#^${RPM_BUILD_ROOT}##g" | \
 	egrep -v '^/usr/bin/(vtk|pvtk|vtkWrap.*|vtkParse.*|VTKJavaExecutable|vtkpython|pvtkpython)$' \
@@ -390,6 +387,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2012/02/25 11:18:57  qboosh
+- more build updates; removed obsolete patch
+
 Revision 1.13  2012/02/04 05:22:59  qboosh
 - updated URL and some build parts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vtk/vtk.spec?r1=1.13&r2=1.14&f=u