Clean up SPEC file, tools require pyhton library (#2290426)

[skip changelog]

.gitignore

@@ -1,3 +1 @@
-/vapoursynth-R48.tar.gz
-/vapoursynth-R51.tar.gz
-/vapoursynth-R57.tar.gz
+*.tar.gz

README.md

@@ -1,3 +1,6 @@
 # vapoursynth
 
-The vapoursynth package
+The vapoursynth package. The upstream project does not provide any versioning
+for the shared library, even with ABI changes. This package sets the library
+version to the upstream release version, to avoid having an unversioned shared
+object that might get updated by mistake.

changelog

@@ -0,0 +1,62 @@
+* Wed Mar 02 2022 Simone Caronni <negativo17@gmail.com> - 57-1
+- Update to R57.
+- Plugins are now separate.
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 51-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sun Dec 19 2021 Sandro Mani <manisandro@gmail.com> - 51-6
+- Rebuild (tesseract)
+
+* Tue Dec 14 2021 Sandro Mani <manisandro@gmail.com> - 51-5
+- Rebuild (tesseract)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 51-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 51-3
+- Rebuilt for Python 3.10
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 51-2
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
+* Tue Mar 23 2021 Simone Caronni <negativo17@gmail.com> - 51-1
+- Update to R51.
+- Allow building for other archs beside x86.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 48-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Oct 17 2020 Jeff Law <law@redhat.com> - 48-10
+- Fix missing #include for gcc-11
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 48-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 48-8
+- Rebuilt for Python 3.9
+
+* Sat Mar 07 2020 Simone Caronni <negativo17@gmail.com> - 48-7
+- Fix broken dependency.
+
+* Sat Feb 29 2020 Simone Caronni <negativo17@gmail.com> - 48-6
+- Make it exclusive for i686/x86_64.
+- Fix build on RHEL/CentOS 8.
+
+* Tue Feb 25 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 48-5
+- Add tests
+- Cosmetic spec file improvements
+
+* Thu Feb 20 2020 Simone Caronni <negativo17@gmail.com> - 48-4
+- More review fixes.
+- Use upstream patch for Python 3.8.
+
+* Fri Feb 07 2020 Simone Caronni <negativo17@gmail.com> - 48-3
+- Review fixes.
+
+* Sun Jan 26 2020 Simone Caronni <negativo17@gmail.com> - 48-2
+- Move script library into main library package.
+- Fix build with Python 3.8.
+
+* Thu Jan 16 2020 Simone Caronni <negativo17@gmail.com> - 48-1
+- First build.

vapoursynth.spec

@@ -1,8 +1,8 @@
 Name:       vapoursynth
 Version:    57
-Release:    1%{?dist}
+Release:    %autorelease
 Summary:    Video processing framework with simplicity in mind
-License:    LGPLv2
+License:    LGPL-2.1-only
 URL:        http://www.vapoursynth.com
 
 Source0:    https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{version}.tar.gz
@@ -14,17 +14,10 @@ BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  nasm
-BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(tesseract)
 BuildRequires:  pkgconfig(zimg)
-BuildRequires:  python3
-BuildRequires:  python3-Cython
-BuildRequires:  python3-setuptools
-
-%{?_with_tests:
-BuildRequires:  %{name}-devel
-BuildRequires:  python3dist(pytest)
-}
+BuildRequires:  pytest
+BuildRequires:  python3-devel
 
 %description
 VapourSynth is an application for video manipulation. Or a plugin. Or a library.
@@ -56,6 +49,7 @@ Development files for %{name}.
 
 %package        tools
 Summary:        Extra tools for VapourSynth
+Requires:       python3-vapoursynth%{?_isa} = %{version}-%{release}
 
 %description    tools
 This package contains the vspipe tool for interfacing with VapourSynth.
@@ -63,6 +57,9 @@ This package contains the vspipe tool for interfacing with VapourSynth.
 %prep
 %autosetup -p1 -n %{name}-R%{version}
 
+%generate_buildrequires
+%pyproject_buildrequires
+
 %build
 autoreconf -vif
 %configure \
@@ -75,11 +72,17 @@ autoreconf -vif
 
 %make_build
 
+# Make libraries available for Python linking
+ln -sf .libs build
+%pyproject_wheel
+
 %install
-%py3_install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete
 
+%pyproject_install
+%pyproject_save_files %{name}
+
 # Create plugin directory
 mkdir -p %{buildroot}%{_libdir}/%{name}
 
@@ -89,10 +92,9 @@ rm -fr %{buildroot}%{_docdir}/%{name}
 %ldconfig_scriptlets libs
 %ldconfig_scriptlets -n python3-%{name}
 
-%{?_with_tests:
 %check
-%{python3} -m pytest -v
-}
+export LD_LIBRARY_PATH=build
+%pytest
 
 %files libs
 %doc ChangeLog
@@ -101,10 +103,6 @@ rm -fr %{buildroot}%{_docdir}/%{name}
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/lib%{name}-script.so.*
 
-%files -n python3-%{name}
-%{python3_sitearch}/%{name}.so
-%{python3_sitearch}/VapourSynth-*.egg-info
-
 %files devel
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
@@ -115,66 +113,8 @@ rm -fr %{buildroot}%{_docdir}/%{name}
 %files tools
 %{_bindir}/vspipe
 
+%files -n python3-%{name} -f %{pyproject_files}
+%{python3_sitearch}/%{name}.so
+
 %changelog
-* Wed Mar 02 2022 Simone Caronni <negativo17@gmail.com> - 57-1
-- Update to R57.
-- Plugins are now separate.
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 51-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sun Dec 19 2021 Sandro Mani <manisandro@gmail.com> - 51-6
-- Rebuild (tesseract)
-
-* Tue Dec 14 2021 Sandro Mani <manisandro@gmail.com> - 51-5
-- Rebuild (tesseract)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 51-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 51-3
-- Rebuilt for Python 3.10
-
-* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 51-2
-- Rebuilt for removed libstdc++ symbol (#1937698)
-
-* Tue Mar 23 2021 Simone Caronni <negativo17@gmail.com> - 51-1
-- Update to R51.
-- Allow building for other archs beside x86.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 48-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Oct 17 2020 Jeff Law <law@redhat.com> - 48-10
-- Fix missing #include for gcc-11
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 48-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 48-8
-- Rebuilt for Python 3.9
-
-* Sat Mar 07 2020 Simone Caronni <negativo17@gmail.com> - 48-7
-- Fix broken dependency.
-
-* Sat Feb 29 2020 Simone Caronni <negativo17@gmail.com> - 48-6
-- Make it exclusive for i686/x86_64.
-- Fix build on RHEL/CentOS 8.
-
-* Tue Feb 25 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 48-5
-- Add tests
-- Cosmetic spec file improvements
-
-* Thu Feb 20 2020 Simone Caronni <negativo17@gmail.com> - 48-4
-- More review fixes.
-- Use upstream patch for Python 3.8.
-
-* Fri Feb 07 2020 Simone Caronni <negativo17@gmail.com> - 48-3
-- Review fixes.
-
-* Sun Jan 26 2020 Simone Caronni <negativo17@gmail.com> - 48-2
-- Move script library into main library package.
-- Fix build with Python 3.8.
-
-* Thu Jan 16 2020 Simone Caronni <negativo17@gmail.com> - 48-1
-- First build.
+%autochangelog