From cdcf3b0626f8912e78432d2263bda2aa3ed76813 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Jun 21 2020 08:13:40 +0000 Subject: Remove undocumented and undefined function on Python 3.9 Use documented python function defined on Python 3.9 (#1843100) --- diff --git a/blender.spec b/blender.spec index 4abb124..a91dc68 100644 --- a/blender.spec +++ b/blender.spec @@ -17,7 +17,7 @@ Name: blender Epoch: 1 Version: %{blender_api}.0 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -34,7 +34,7 @@ Patch0: %{name}-%{blender_api}-droid.patch # Development stuff BuildRequires: boost-devel -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: gettext @@ -48,16 +48,16 @@ BuildRequires: pkgconfig(jemalloc) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(pugixml) BuildRequires: pkgconfig(python3) >= 3.5 BuildRequires: pkgconfig(xxf86vm) -BuildRequires: pugixml-devel BuildRequires: python3-numpy BuildRequires: python3-requests BuildRequires: subversion-devel # Compression stuff -BuildRequires: lzo-devel BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(lzo2) BuildRequires: pkgconfig(zlib) # 3D modeling stuff @@ -172,6 +172,13 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake # Fix all Python shebangs recursively in . pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . +# Replace undocumented removed python declaration upstream on Python 3.9 +# https://bugs.python.org/issue39372 +# https://bugzilla.redhat.com/show_bug.cgi?id=1843100#c3 +%if 0%{?fedora} > 32 + sed -i 's|PyNoArgsFunction|PyCFunction|g' source/blender/python/mathutils/mathutils_Matrix.c +%endif + mkdir cmake-make %build @@ -260,6 +267,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %{_metainfodir}/%{name}-fonts.metainfo.xml %changelog +* Sat Jun 20 2020 Luya Tshimbalanga - 1:2.83.0-2 +- Remove undocumented and undefined function on Python 3.9 +- Use documented python function defined on Python 3.9 (#1843100) + * Sun Jun 14 2020 Luya Tshimbalanga - 1:2.83.0-1.1 - Temporarily exclude ARM architecture (#1843100)