From 490559d9cc562766bc7b20f36a31c2199360ee5a Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Jun 09 2020 02:37:18 +0000
Subject: Update to 2.83.0 (#1843623)

Clean up spec file

---

diff --git a/.gitignore b/.gitignore
index 1328b8d..6903522 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /blender-2.81a-droid.patch
 /blender-2.82.tar.xz
 /blender-2.82a.tar.xz
+/blender-2.83.0.tar.xz
diff --git a/blender-2.81a-droid.patch b/blender-2.81a-droid.patch
deleted file mode 100644
index d547630..0000000
--- a/blender-2.81a-droid.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- blender-2.81.old/source/blender/blenfont/intern/blf_font_i18n.c	2019-07-24 00:41:39.000000000 -0700
-+++ blender-2.81/source/blender/blenfont/intern/blf_font_i18n.c	2019-07-31 19:55:46.069808055 -0700
-@@ -50,7 +50,7 @@
- 
- static void fontbuf_load(struct FontBuf *fb)
- {
--  const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
-+  const char *fontpath = "/usr/share/fonts/blender";
-   if (fontpath) {
-     char unifont_path[1024];
-     BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, fb->filename);
---- blender-2.81.old/source/creator/CMakeLists.txt	2019-07-24 00:41:39.000000000 -0700
-+++ blender-2.81/source/creator/CMakeLists.txt	2019-08-05 17:38:34.223948608 -0700
-@@ -393,9 +393,8 @@
- # localization
- if(WITH_INTERNATIONAL)
-   install(
--    DIRECTORY
--      ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
--    DESTINATION ${TARGETDIR_VER}/datafiles
-+    DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/
-+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender
-   )
- 
-   set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
diff --git a/blender.spec b/blender.spec
index 4f77574..d028e32 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,4 +1,4 @@
-%global blender_api 2.82
+%global blender_api 2.83
 
 # Turn off the brp-python-bytecompile script
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@@ -16,8 +16,8 @@
 
 Name:       blender
 Epoch:      1
-Version:    %{blender_api}a
-Release:    5%{?dist}
+Version:    %{blender_api}.0
+Release:    1%{?dist}
 
 Summary:    3D modeling, animation, rendering and post-production
 License:    GPLv2
@@ -26,14 +26,11 @@ URL:        http://www.blender.org
 Source0:    http://download.%{name}.org/source/%{name}-%{version}.tar.xz
 Source1:    %{name}.thumbnailer
 Source2:    %{name}-fonts.metainfo.xml
-Source5:    %{name}.xml
-Source10:   macros.%{name}
+Source3:    %{name}.xml
+Source4:    macros.%{name}
 
-Patch0:     %{name}-2.81a-droid.patch
-# Invalid upstream appdata causes segmentation fault
-# https://github.com/hughsie/appstream-glib/issues/337
-# https://developer.blender.org/D7149
-Patch1:     %{name}-2.82a-fix_appdata_validation.patch
+# Patch to separate built-in fonts to the fonts directory
+Patch0:     %{name}-%{blender_api}-droid.patch
 
 # Development stuff
 BuildRequires:  boost-devel
@@ -205,14 +202,14 @@ popd
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/thumbnailers/%{name}.thumbnailer
 
 # Mime support
-install -p -D -m 644 %{SOURCE5} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
+install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
 # Deal with docs in the files section
 rm -rf %{buildroot}%{_docdir}/%{name}/*
 
 # rpm macros
 mkdir -p %{buildroot}%{macrosdir}
-sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} > %{buildroot}%{macrosdir}/macros.%{name}
+sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE4} > %{buildroot}%{macrosdir}/macros.%{name}
 
 # AppData
 install -p -m 644 -D release/freedesktop/org.%{name}.Blender.appdata.xml \
@@ -258,6 +255,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.
 %{_metainfodir}/%{name}-fonts.metainfo.xml
 
 %changelog
+* Wed Jun 03 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.83.0-1
+- Update to 2.83.0 (#1843623)
+- Clean up spec file
+
 * Tue May 12 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.82a-5
 - Rebuild for embree 3.10.0
 
diff --git a/sources b/sources
index 08591cc..197354f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.82a.tar.xz) = 64c4ad8ac577e9af8b10d9b9ae3b0eb134258d4ceca78f15a6c42197d14499931ac6cf36f72aedbdb8962c67044d6feb5a2df777640f9096e05eed78f6d80bd6
+SHA512 (blender-2.83.0.tar.xz) = 91a6b1997c2620e84e290fb7036d9dc148481187801f8b80dcb1ca958dc8300a8327e74c41fcdcfbb4d6d9f2691175cd78fc4c91c68b72b17f971a9d1fed52ce