From 5076982fb11ac1e782ba12ecffd29570b2550272 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Aug 24 2020 14:12:52 +0000
Subject: Disable Embree, too new


---

diff --git a/blender.spec b/blender.spec
index bc3ee06..bc47d72 100644
--- a/blender.spec
+++ b/blender.spec
@@ -14,18 +14,14 @@
 %global cyclesflag OFF
 %endif
 
-# Default to build without FFMpeg
-%bcond_with     ffmpeg
-
-# Default to build without OSL
-%bcond_with     openshading
+%bcond_with ffmpeg
+%bcond_with openshading
+%bcond_with embree
 
 # Only available on x86_64
 %ifarch x86_64
-%bcond_without  embree
 %bcond_without  oidn
 %else
-%bcond_with     embree
 %bcond_with     oidn
 %endif
 
@@ -53,9 +49,6 @@ Patch0:     %{name}-%{blender_api}-droid.patch
 Patch1:     %{name}-support-python-3.9.diff
 %endif
 
-# https://developer.blender.org/rBecc15c55d4e2004fc2d6347f8437d8c06c5b55b3
-Patch2:     %{name}-embree-3.10.patch
-
 # Development stuff
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -278,9 +271,6 @@ install -p -m 644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}-fonts.metain
 # Localization
 %find_lang %{name}
 
-#  Avoid having locales listed twice
-rm -fr %{buildroot}%{_datadir}/%{blender_api}/locale/languages
-
 # rpmlint fixes
 find %{buildroot}%{_datadir}/%{name}/%{blender_api}/scripts -name "*.py" -exec chmod 755 {} \;
 #find %%{buildroot}%%{_datadir}/%%{name}/scripts -type f -exec sed -i -e 's/\r$//g' {} \;
@@ -299,6 +289,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.
 %{_bindir}/%{name}-thumbnailer.py
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/
+# Pulled in by the localization, avoid listing twice
+%exclude %{_datadir}/%{name}/%{blender_api}/datafiles/locale
 %{_datadir}/icons/hicolor/*/apps/%{name}*.*
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/thumbnailers/%{name}.thumbnailer
@@ -314,13 +306,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.
 %{_metainfodir}/%{name}-fonts.metainfo.xml
 
 %changelog
-* Sat Aug 22 2020 Simone Caronni <negativo17@gmail.com> - 1:2.83.5-2
+* Mon Aug 24 2020 Simone Caronni <negativo17@gmail.com> - 1:2.83.5-2
 - Be consistent with build options format and distribution conditionals.
 - rpmlint fixes.
 - Fix build dependencies.
 - Fix Python 3.9 patch.
 - Disable OpenShadingLanguage, 1.11 is not supported.
-- Add patch for newer Embree.
+- Disable Embree, 3.11 is not supported.
 
 * Wed Aug 19 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.83.5-1
 - Update to 2.83.5 (#1855165)