From c5ce9d1c09625de6892e33eb9bc69c65a9f4eb28 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 28 Jul 2013 23:05:16 -0600 Subject: [PATCH 1/5] Build QVTKWidget and QVTKWidget2 (bug #981786) --- vtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 552ab5f..912ca0d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -12,7 +12,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.10.1 -Release: 4%{?dist} +Release: 5%{?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 @@ -192,6 +192,7 @@ pushd build %else -DVTK_WRAP_JAVA:BOOL=OFF \ %endif + -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ -DVTK_WRAP_TCL:BOOL=ON \ -DVTK_USE_BOOST:BOOL=ON \ -DVTK_USE_GL2PS:BOOL=ON \ @@ -203,6 +204,7 @@ pushd build -DVTK_USE_SYSTEM_LIBRARIES=ON \ -DVTK_USE_SYSTEM_LIBPROJ4=OFF \ -DVTK_USE_QVTK=ON \ + -DVTK_USE_QVTK_QTOPENGL=ON \ -DVTK_USE_QT=ON \ -DVTK_USE_TEXT_ANALYSIS=ON @@ -413,6 +415,9 @@ rm -rf %{buildroot} %doc vtk-examples/Examples %changelog +* Sun Jul 28 2013 Orion Poplawski - 5.10.1-5 +- Build QVTKWidget and QVTKWidget2 (bug #981786) + * Fri Feb 15 2013 Fedora Release Engineering - 5.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 4e92edf4f1948c7fead7778184f1ea2c6bfae715 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 28 Jul 2013 23:41:01 -0600 Subject: [PATCH 2/5] Enable WRAP_PYTHON_SIP --- vtk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vtk.spec b/vtk.spec index 912ca0d..7a28b45 100644 --- a/vtk.spec +++ b/vtk.spec @@ -184,6 +184,7 @@ pushd build %endif -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \ -DVTK_WRAP_PYTHON:BOOL=ON \ + -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ %if %{with java} -DVTK_WRAP_JAVA:BOOL=ON \ -DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \ From 60e8539c4b56a2589f6cea4ac5dbe8b0580b258c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 28 Jul 2013 23:42:36 -0600 Subject: [PATCH 3/5] Add BR sip-devel --- vtk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vtk.spec b/vtk.spec index 7a28b45..16bf9d8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -57,6 +57,7 @@ BuildRequires: hdf5-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel +BuildRequires: sip-devel BuildRequires: wget BuildRequires: %{_includedir}/Xm %{!?with_java:Conflicts: vtk-java} From f72afb1e472d056ec55d53e57db9f98c5e8d08e6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 28 Jul 2013 23:55:34 -0600 Subject: [PATCH 4/5] Set SIP_INCLUDE_DIR --- vtk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vtk.spec b/vtk.spec index 16bf9d8..b279f35 100644 --- a/vtk.spec +++ b/vtk.spec @@ -186,6 +186,7 @@ pushd build -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ + -DSIP_INCLUDE_DIR:PATH=/usr/include/python2.7 \ %if %{with java} -DVTK_WRAP_JAVA:BOOL=ON \ -DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \ From dcc9cd62235cee00593801595d8e4d8bf34bb54e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 29 Jul 2013 16:57:29 -0600 Subject: [PATCH 5/5] Add BR PyQt4-devel --- vtk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vtk.spec b/vtk.spec index b279f35..9b00ec1 100644 --- a/vtk.spec +++ b/vtk.spec @@ -57,6 +57,7 @@ BuildRequires: hdf5-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel +BuildRequires: PyQt4-devel BuildRequires: sip-devel BuildRequires: wget BuildRequires: %{_includedir}/Xm