diff --git a/blender.spec b/blender.spec index eb081ff..6818c2f 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 3.5 +%global blender_api 3.6 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %bcond_without clang @@ -35,7 +35,7 @@ Name: blender Epoch: 1 -Version: 3.5.1 +Version: 3.6.0 Release: %autorelease @@ -47,7 +47,7 @@ Source0: https://download.%{name}.org/source/%{name}-%{version}.tar.xz # Upstream separated addons from the main source Source1: https://projects.%{name}.org/%{name}/%{name}-addons/archive/v%{version}.tar.gz#/%{name}-addons-%{version}.tar.gz # Rename macros extension to avoid clashing with upstream version -Source3: macros.%{name}-rpm +Source2: macros.%{name}-rpm # Development stuff BuildRequires: boost-devel @@ -106,9 +106,8 @@ BuildRequires: pkgconfig(libzstd) # 3D modeling stuff BuildRequires: cmake(ceres) -# Switch to embree3 for compatibility reason %if %{with embree} -BuildRequires: embree3-devel +BuildRequires: embree-devel %endif BuildRequires: opensubdiv-devel >= 3.4.4 %if %{with openshading} @@ -264,8 +263,7 @@ sed -i "s/date_time/date_time python%{python3_version_nodots}/" \ -DCLANG_INCLUDE_DIR=%{_includedir}/clang \ -D_CLANG_LIBRARIES=%{_libdir} \ %endif - -DEMBREE_INCLUDE_DIR=%{_includedir}/embree3 \ - -DEMBREE_LIBRARY=%{_libdir}/libembree3.so.3 \ + -DEMBREE_INCLUDE_DIR=%{_includedir} \ -DPYTHON_VERSION=%{python3_version} \ -DWITH_COMPILER_CCACHE=ON \ -DWITH_CYCLES=%{cyclesflag} \ @@ -311,7 +309,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}/* # rpm macros mkdir -p %{buildroot}%{macrosdir} -sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE3} > %{buildroot}%{macrosdir}/macros.%{name}-rpm +sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE2} > %{buildroot}%{macrosdir}/macros.%{name}-rpm # AppData install -p -m 644 -D release/freedesktop/org.%{name}.Blender.appdata.xml \ diff --git a/sources b/sources index 9be6aad..0a8aa22 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (blender-3.5.1.tar.xz) = 7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131 -SHA512 (blender-addons-3.5.1.tar.gz) = 6299f65708423d7eafd8727a72108f71311970fb80a2029443a9f992c5760b443a1fbdba37b4b828074c8ee1d5d620efa2700072afa856fab4c3519e63a34ed4 +SHA512 (blender-3.6.0.tar.xz) = 5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb +SHA512 (blender-addons-3.6.0.tar.gz) = db8da3af14bde50bdb9bcce25caec68928be2a0e393992efcd7f9b457b8241c8aadddadb5e0cfcf5bfa94d495bc917823b73a84e126029dc47e0cb1229f8c024