- removed obsolete abi patch (rejected with fuzz 0, changes already applied upstream)

- added pugixml patch (adjust pugixml cmake macros for 1.11.x)
- explicit libs lists, exclude doesn't work properly with rpm.org build-id symlinks packaging

diff --git a/vtk-abi.patch b/vtk-abi.patch
deleted file mode 100644 (file)
index d867475..0000000
--- a/vtk-abi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up VTK-7.1.0/Wrapping/Tools/vtkParsePreprocess.c.abi VTK-7.1.0/Wrapping/Tools/vtkParsePreprocess.c
---- VTK-7.1.0/Wrapping/Tools/vtkParsePreprocess.c.abi  2016-11-14 09:59:47.000000000 -0700
-+++ VTK-7.1.0/Wrapping/Tools/vtkParsePreprocess.c      2016-12-01 16:12:45.793113151 -0700
-@@ -2445,6 +2445,21 @@ void vtkParsePreprocess_AddStandardMacro
- #ifdef __LITTLE_ENDIAN__
-     PREPROC_ADD_MACRO(info, __LITTLE_ENDIAN__);
- #endif
-+#ifdef __CHAR_UNSIGNED__
-+    PREPROC_ADD_MACRO(info, __CHAR_UNSIGNED__);
-+#endif
-+#ifdef __SIZEOF_POINTER__
-+    PREPROC_ADD_MACRO(info, __SIZEOF_POINTER__);
-+#endif
-+#ifdef _LP64
-+    PREPROC_ADD_MACRO(info, _LP64);
-+#endif
-+#ifdef _ILP32
-+    PREPROC_ADD_MACRO(info, _ILP32);
-+#endif
-+#ifdef __64BIT__
-+    PREPROC_ADD_MACRO(info, __64BIT__);
-+#endif
-   }
- 
-   info->IsExternal = save_external;

diff --git a/vtk-pugixml.patch b/vtk-pugixml.patch
new file mode 100644 (file)
index 0000000..a798128
--- /dev/null
+++ b/vtk-pugixml.patch
@@ -0,0 +1,12 @@
+--- VTK-8.2.0/IO/CityGML/CMakeLists.txt.orig   2019-01-30 18:15:13.000000000 +0100
++++ VTK-8.2.0/IO/CityGML/CMakeLists.txt        2021-01-05 09:43:26.611074217 +0100
+@@ -5,7 +5,7 @@
+ if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
+   find_package(pugixml REQUIRED)
+-  get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES)
+-  get_target_property(pugixml_LIBRARIES pugixml LOCATION)
++  get_target_property(pugixml_INCLUDE_DIRS pugixml::pugixml INTERFACE_INCLUDE_DIRECTORIES)
++  get_target_property(pugixml_LIBRARIES pugixml::pugixml INTERFACE_LINK_LIBRARIES)
+   include_directories(${pugixml_INCLUDE_DIRS})
+   vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
+ endif()

diff --git a/vtk.spec b/vtk.spec
index 81aa6837f60da0caa668ef62dbff6e782f2a54f9..c92a2096075c87db1aaeba85dfd0c193837d4936 100644 (file)
--- a/vtk.spec
+++ b/vtk.spec
@@ -22,11 +22,12 @@ Version:    8.2.0
 Release:       3
 License:       BSD
 Group:         Libraries
-Source0:       http://www.vtk.org/files/release/8.2/VTK-%{version}.tar.gz
+#Source0Download: https://vtk.org/download/
+Source0:       https://www.vtk.org/files/release/8.2/VTK-%{version}.tar.gz
 # Source0-md5: 8af3307da0fc2ef8cafe4a312b821111
-Source1:       http://www.vtk.org/files/release/8.2/VTKData-%{version}.tar.gz
+Source1:       https://www.vtk.org/files/release/8.2/VTKData-%{version}.tar.gz
 # Source1-md5: a6eab7bc02cee1376ee69243dde373ce
-Patch0:                vtk-abi.patch
+Patch0:                %{name}-pugixml.patch
 Patch1:                gcc10.patch
 Patch2:                proj6_compat.patch
 Patch3:                qt-5.15.patch
@@ -34,7 +35,7 @@ Patch4:               python-3.8.patch
 Patch5:                link.patch
 Patch6:                system-pugixml.patch
 Patch7:                freetype.patch
-URL:           http://www.vtk.org/
+URL:           https://vtk.org/
 %{?with_OSMesa:BuildRequires: Mesa-libOSMesa-devel}
 BuildRequires: OpenGL-GLX-devel
 BuildRequires: OpenGL-devel
@@ -315,7 +316,7 @@ potrzebne do uruchamiania różnych przykładów z pakietu vtk-examples.
 
 # Replace relative path ../../../VTKData with destination filesystem path
 grep -Erl '(\.\./)+VTKData' Examples | xargs \
-  perl -pi -e 's,(\.\./)+VTKData,%{_datadir}/vtk-8.1,g'
+       %{__perl} -pi -e 's,(\.\./)+VTKData,%{_datadir}/vtk-8.1,g'
 
 # Save an unbuilt copy of the Example's sources for %doc
 mkdir vtk-examples
@@ -531,16 +532,96 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf
 %dir %{_libdir}/vtk
 %attr(755,root,root) %{_libdir}/vtk/libvtkChartsCore.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommon*.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonColor.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonComputationalGeometry.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonCore.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonDataModel.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonExecutionModel.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMath.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMisc.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonSystem.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonTransforms.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkDICOMParser.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistryOpenGL2.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistry.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilters*.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersAMR.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersCore.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersExtraction.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersFlowPaths.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeneral.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeneric.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeometry.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHybrid.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHyperTree.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersImaging.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersModeling.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallel.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallelImaging.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPoints.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersProgrammable.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersReebGraph.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSMP.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSelection.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSources.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersStatistics.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTexture.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTopology.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersVerdict.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkGeovisCore.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkImaging*.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovis*.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkInteraction*.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkIO*.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAMR.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAsynchronous.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCityGML.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCore.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOEnSight.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExodus.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExport.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportOpenGL2.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportPDF.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOFFMPEG.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGDAL.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeoJSON.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeometry.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImage.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImport.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOInfovis.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLSDyna.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLegacy.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMINC.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMovie.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMySQL.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIONetCDF.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOODBC.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPLY.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallel.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelExodus.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelLSDyna.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelXML.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPostgreSQL.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSQL.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSegY.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOTecplotTable.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVPIC.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVeraOut.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVideo.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXML.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXMLParser.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXdmf2.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingColor.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingCore.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingFourier.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingGeneral.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingHybrid.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMath.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMorphological.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingSources.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStatistics.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStencil.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisBoostGraphAlgorithms.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisCore.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisLayout.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionImage.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionStyle.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionWidgets.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkLocalExample.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkParallelCore.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingAnnotation.so.1
@@ -557,7 +638,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingParallel.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeOpenGL2.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolume.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkTesting*.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkTestingGenericBridge.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkTestingIOSQL.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkTestingRendering.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkViewsContext2D.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkViewsCore.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkViewsGeovis.so.1
@@ -570,27 +653,102 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtksys.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkverdict.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkxdmf2.so.1
-%if %{with java}
-%exclude %{_libdir}/vtk/libvtk*Java.so.1
-%endif
-%exclude %{_libdir}/vtk/libvtk*Python3?D.so.1
-%exclude %{_libdir}/vtk/libvtkWrappingPython3?Core.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %doc Utilities/Upgrading/*
 %attr(755,root,root) %{_bindir}/vtkWrapHierarchy
 %attr(755,root,root) %{_libdir}/vtk/libvtkChartsCore.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommon*.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonColor.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonComputationalGeometry.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonCore.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonDataModel.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonExecutionModel.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMath.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMisc.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonSystem.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonTransforms.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkDICOMParser.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistryOpenGL2.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistry.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilters*.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersAMR.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersCore.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersExtraction.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersFlowPaths.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeneral.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeneric.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeometry.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHybrid.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHyperTree.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersImaging.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersModeling.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallel.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallelImaging.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPoints.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersProgrammable.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersReebGraph.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSMP.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSelection.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSources.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersStatistics.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTexture.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTopology.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersVerdict.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkGeovisCore.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkImaging*.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovis*.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkInteraction*.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkIO*.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAMR.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAsynchronous.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCityGML.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCore.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOEnSight.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExodus.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExport.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportOpenGL2.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportPDF.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOFFMPEG.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGDAL.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeoJSON.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeometry.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImage.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImport.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOInfovis.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLSDyna.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLegacy.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMINC.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMovie.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMySQL.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIONetCDF.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOODBC.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPLY.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallel.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelExodus.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelLSDyna.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelXML.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPostgreSQL.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSQL.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSegY.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOTecplotTable.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVPIC.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVeraOut.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVideo.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXML.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXMLParser.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXdmf2.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingColor.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingCore.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingFourier.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingGeneral.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingHybrid.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMath.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMorphological.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingSources.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStatistics.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStencil.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisBoostGraphAlgorithms.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisCore.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisLayout.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionImage.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionStyle.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionWidgets.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkLocalExample.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkParallelCore.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingAnnotation.so
@@ -607,7 +765,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingParallel.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeOpenGL2.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolume.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkTesting*.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkTestingGenericBridge.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkTestingIOSQL.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkTestingRendering.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkViewsContext2D.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkViewsCore.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkViewsGeovis.so
@@ -620,11 +780,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtksys.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkverdict.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkxdmf2.so
-%if %{with java}
-%exclude %{_libdir}/vtk/libvtk*Java.so
-%endif
-%exclude %{_libdir}/vtk/libvtk*Python3?D.so
-%exclude %{_libdir}/vtk/libvtkWrappingPython3?Core.so
 %{_libdir}/vtk/libvtkWrappingTools.a
 %dir %{_includedir}/vtk
 %{_includedir}/vtk/VPIC
@@ -687,20 +842,117 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtkWrappingJava.so.1
 # java modules
 %attr(755,root,root) %{_libdir}/vtk/libvtkChartsCoreJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommon*Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonColorJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonComputationalGeometryJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonCoreJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonDataModelJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonExecutionModelJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMathJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMiscJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonSystemJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonTransformsJava.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistryJava.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistryOpenGL2Java.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilters*Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersAMRJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersCoreJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersExtractionJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersFlowPathsJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeneralJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGenericJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeometryJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHybridJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHyperTreeJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersImagingJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersModelingJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallelJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallelImagingJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPointsJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersProgrammableJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersReebGraphJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSMPJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSelectionJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSourcesJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersStatisticsJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTextureJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTopologyJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersVerdictJava.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkGeovisCoreJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkIO*Java.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkImaging*Java.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovis*Java.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkInteraction*Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAMRJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAsynchronousJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCityGMLJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCoreJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOEnSightJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExodusJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportOpenGL2Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportPDFJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOFFMPEGJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGDALJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeoJSONJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeometryJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImageJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImportJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOInfovisJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLSDynaJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLegacyJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMINCJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMovieJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMySQLJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIONetCDFJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOODBCJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPLYJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelExodusJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelLSDynaJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelXMLJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPostgreSQLJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSQLJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSegYJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOTecplotTableJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVPICJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVeraOutJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVideoJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXMLJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXMLParserJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXdmf2Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingColorJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingCoreJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingFourierJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingGeneralJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingHybridJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMathJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMorphologicalJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingSourcesJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStatisticsJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStencilJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisBoostGraphAlgorithmsJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisCoreJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisLayoutJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionImageJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionStyleJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionWidgetsJava.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkLocalExampleJava.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkParallelCoreJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkRendering*Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingAnnotationJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContext2DJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContextOpenGL2Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingCoreJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeTypeJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingGL2PSOpenGL2Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingImageJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingLODJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingLabelJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingMatplotlibJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingOpenGL2Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingParallelJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingQtJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeOpenGL2Java.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkTestingRenderingJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkViews*Java.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsContext2DJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsCoreJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsGeovisJava.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsInfovisJava.so
 %{_libdir}/vtk/vtk.jar
 
 %files java-devel
@@ -716,14 +968,126 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/vtkWrapPython
 %attr(755,root,root) %{_bindir}/vtkWrapPythonInit
 %attr(755,root,root) %{_bindir}/vtkpython
-%attr(755,root,root) %{_libdir}/vtk/libvtk*Python3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkChartsCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonColorPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonComputationalGeometryPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonDataModelPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonExecutionModelPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMathPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMiscPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonSystemPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonTransformsPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistryPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistryOpenGL2Python3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersAMRPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersExtractionPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersFlowPathsPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeneralPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGenericPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeometryPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHybridPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHyperTreePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersImagingPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersModelingPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallelPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallelImagingPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPointsPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersProgrammablePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPython.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPythonPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersReebGraphPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSMPPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSelectionPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSourcesPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersStatisticsPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTexturePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTopologyPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersVerdictPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkGeovisCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAMRPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAsynchronousPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCityGMLPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOEnSightPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExodusPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportOpenGL2Python3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportPDFPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOFFMPEGPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGDALPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeoJSONPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeometryPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImagePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImportPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOInfovisPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLSDynaPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLegacyPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMINCPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMoviePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMySQLPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIONetCDFPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOODBCPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPLYPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelExodusPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelLSDynaPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelXMLPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPostgreSQLPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSQLPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSegYPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOTecplotTablePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVPICPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVeraOutPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVideoPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXMLPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXMLParserPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXdmf2Python3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingColorPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingFourierPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingGeneralPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingHybridPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMathPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMorphologicalPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingSourcesPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStatisticsPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStencilPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisBoostGraphAlgorithmsPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisLayoutPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionImagePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionStylePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionWidgetsPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkParallelCorePython3?D.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkPythonContext2D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkPythonContext2DPython3?D.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkPythonInterpreter.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingAnnotationPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContext2DPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContextOpenGL2Python3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeTypePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingGL2PSOpenGL2Python3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingImagePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingLODPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingLabelPython3?D.so.1
 # RenderingMatplotlib requires PythonInterpreter
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingMatplotlib.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonTkWidgets-8.2.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingMatplotlibPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingOpenGL2Python3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingParallelPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingQtPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeOpenGL2Python3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkTestingRenderingPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsContext2DPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsCorePython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsGeovisPython3?D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsInfovisPython3?D.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkWrappingPython3?Core.so.1
-%dir %{py3_sitedir}/vtk.py
+%{py3_sitedir}/vtk.py
 %dir %{py3_sitedir}/vtkmodules
 %{py3_sitedir}/vtkmodules/*.py
 %{py3_sitedir}/vtkmodules/__pycache__
@@ -755,10 +1119,124 @@ rm -rf $RPM_BUILD_ROOT
 
 %files python3-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vtk/libvtk*Python3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkChartsCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonColorPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonComputationalGeometryPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonDataModelPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonExecutionModelPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMathPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonMiscPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonSystemPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkCommonTransformsPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistryPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkDomainsChemistryOpenGL2Python3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersAMRPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersExtractionPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersFlowPathsPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeneralPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGenericPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersGeometryPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHybridPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersHyperTreePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersImagingPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersModelingPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallelPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersParallelImagingPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPointsPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersProgrammablePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPython.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersPythonPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersReebGraphPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSMPPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSelectionPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersSourcesPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersStatisticsPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTexturePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersTopologyPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkFiltersVerdictPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkGeovisCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAMRPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOAsynchronousPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCityGMLPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOEnSightPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExodusPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportOpenGL2Python3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOExportPDFPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOFFMPEGPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGDALPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeoJSONPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOGeometryPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImagePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOImportPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOInfovisPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLSDynaPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOLegacyPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMINCPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMoviePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOMySQLPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIONetCDFPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOODBCPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPLYPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelExodusPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelLSDynaPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOParallelXMLPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOPostgreSQLPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSQLPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOSegYPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOTecplotTablePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVPICPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVeraOutPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOVideoPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXMLPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXMLParserPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkIOXdmf2Python3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingColorPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingFourierPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingGeneralPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingHybridPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMathPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingMorphologicalPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingSourcesPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStatisticsPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkImagingStencilPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisBoostGraphAlgorithmsPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisLayoutPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionImagePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionStylePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkInteractionWidgetsPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkParallelCorePython3?D.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkPythonContext2D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkPythonContext2DPython3?D.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkPythonInterpreter.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingAnnotationPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContext2DPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContextOpenGL2Python3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeTypePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingGL2PSOpenGL2Python3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingImagePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingLODPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingLabelPython3?D.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingMatplotlib.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingMatplotlibPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingOpenGL2Python3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingParallelPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonTkWidgets-8.2.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingQtPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeOpenGL2Python3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkTestingRenderingPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsContext2DPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsCorePython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsGeovisPython3?D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkViewsInfovisPython3?D.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkWrappingPython3?Core.so
 %{_includedir}/vtk/PyVTK*.h
 %{_includedir}/vtk/vtkPython*.h