diff --git a/vtk.changes b/vtk.changes index 6b5e917..1e7b947 100644 --- a/vtk.changes +++ b/vtk.changes @@ -3,6 +3,7 @@ Thu Mar 10 22:01:28 UTC 2022 - Stefan Brüns - Split java-devel subpackage from devel package, avoid pulling in Java on most builds. +- Move python support libraries to python subpackage. ------------------------------------------------------------------- Thu Feb 10 21:33:32 UTC 2022 - Stefan Brüns diff --git a/vtk.spec b/vtk.spec index d13b021..1434776 100644 --- a/vtk.spec +++ b/vtk.spec @@ -212,7 +212,6 @@ This package provides the shared libraries for VTK. %package devel Summary: VTK header files for building C++ code -# not strictly necessary, but required by VTKs cmake files Group: Development/Libraries/C and C++ Requires: %{name}-qt = %{version} Requires: %{shlib} = %{version} @@ -227,6 +226,7 @@ Requires: libjpeg-devel Requires: libmysqlclient-devel Requires: libnetcdf_c++-devel Requires: libtiff-devel +# not strictly necessary, but required by VTKs cmake files Requires: python3-%{name} = %{version} Requires: utfcpp-devel %{?with_mpi:Requires: %{mpi_flavor}} @@ -276,7 +276,7 @@ Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} Requires: %{name}-java = %{version} Requires: java-devel -Provides: %{name}-devel:%{my_bindir}/%{pkgname}WrapJava +Provides: %{name}-devel:%{my_libdir}/libvtkJava.so %description java-devel VTK is a software system for image processing, 3D graphics, volume @@ -555,8 +555,7 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl %license Copyright.txt %{my_libdir}/lib*.so.* %exclude %{my_libdir}/libvtk*Qt*.so.* -%exclude %{my_libdir}/libvtk*Java.so.1 -%exclude %{my_libdir}/libvtk*Python*.so.1 +%exclude %{my_libdir}/libvtk*Python*.so.* %files devel %license Copyright.txt @@ -565,6 +564,9 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl %{my_bindir}/vtkProbeOpenGLVersion %endif %{my_bindir}/%{pkgname}WrapHierarchy +# Should go into java-devel, but referenced by VTK-targets*.cmake +%{my_bindir}/%{pkgname}WrapJava +%{my_bindir}/%{pkgname}ParseJava %{my_bindir}/%{pkgname}WrapPython %{my_bindir}/%{pkgname}WrapPythonInit %{my_libdir}/*.so @@ -573,9 +575,8 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl %{my_libdir}/cmake/%{pkgname}-%{series}/ %{my_incdir}/%{pkgname}-%{series}/ # VTK JNI -%exclude %{my_libdir}/libvtk*Java.so +%exclude %{my_libdir}/libvtkJava.so %exclude %{my_libdir}/cmake/%{pkgname}-%{series}/VTKJava-*.cmake -%exclude %{my_libdir}/cmake/%{pkgname}-%{series}/*WrapJava-*.cmake %if %{with documentation} %files devel-doc @@ -586,20 +587,18 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl %if %{with java} %files java %license Copyright.txt -%{my_libdir}/libvtk*Java.so -%{my_libdir}/libvtk*Java.so.1 +# VTK JNI %{my_libdir}/java/ %files java-devel -%{my_bindir}/%{pkgname}WrapJava -%{my_bindir}/%{pkgname}ParseJava +%{my_libdir}/libvtkJava.so %{my_libdir}/cmake/%{pkgname}-%{series}/VTKJava-*.cmake -%{my_libdir}/cmake/%{pkgname}-%{series}/*WrapJava*.cmake %endif %files -n python3-%{name} %license Copyright.txt %{my_bindir}/%{pkgname}python +%{my_libdir}/libvtk*Python*.so.* %if %{with mpi} %{my_bindir}/p%{pkgname}python %{my_libdir}/py* @@ -608,7 +607,6 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl %{python3_sitearch}/vtk-%{version}*-info %{python3_sitearch}/vtkmodules %endif -%{my_libdir}/libvtk*Python*.so.1 %files qt %license Copyright.txt