From ad60588a787dabd10832dcd153b59d50be9227a2 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Jun 15 2020 06:31:22 +0000 Subject: Temporarily exclude ARM architecture (#1843100) --- diff --git a/.gitignore b/.gitignore index 384687d..6903522 100644 --- a/.gitignore +++ b/.gitignore @@ -55,4 +55,3 @@ /blender-2.82.tar.xz /blender-2.82a.tar.xz /blender-2.83.0.tar.xz -/blender-2.83-droid.patch diff --git a/blender-2.83-droid.patch b/blender-2.83-droid.patch new file mode 100644 index 0000000..8858074 --- /dev/null +++ b/blender-2.83-droid.patch @@ -0,0 +1,27 @@ +diff -ru blender-2.83.0.old/source/blender/blenfont/intern/blf_font_default.c blender-2.83.0/source/blender/blenfont/intern/blf_font_default.c +--- blender-2.83.0.old/source/blender/blenfont/intern/blf_font_default.c 2020-06-03 07:18:19.000000000 -0700 ++++ blender-2.83.0/source/blender/blenfont/intern/blf_font_default.c 2020-06-08 18:51:22.642003171 -0700 +@@ -33,7 +33,7 @@ + + static int blf_load_font_default(const char *filename, const bool unique) + { +- const char *dir = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); ++ const char *dir = "/usr/share/fonts/blender"; + if (dir == NULL) { + fprintf(stderr, + "%s: 'fonts' data path not found for '%s', will not be able to display text\n", +diff -ru blender-2.83.0.old/source/creator/CMakeLists.txt blender-2.83.0/source/creator/CMakeLists.txt +--- blender-2.83.0.old/source/creator/CMakeLists.txt 2020-06-03 07:18:27.000000000 -0700 ++++ blender-2.83.0/source/creator/CMakeLists.txt 2020-06-08 18:53:45.975733489 -0700 +@@ -387,9 +387,8 @@ + + # fonts + 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 + ) + + # localization diff --git a/blender.spec b/blender.spec index d028e32..4abb124 100644 --- a/blender.spec +++ b/blender.spec @@ -17,7 +17,7 @@ Name: blender Epoch: 1 Version: %{blender_api}.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -130,6 +130,11 @@ Provides: blender(ABI) = %{blender_api} Obsoletes: blenderplayer < 1:2.80-1 Provides: blenderplayer = 1:2.80-1 +# Temporarily exclude ARM32 architecture due to build failure +# https://koji.fedoraproject.org/koji/taskinfo?taskID=45594704 +# https://bugzilla.redhat.com/show_bug.cgi?id=1843100 +ExcludeArch: armv7hl + %description Blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback. @@ -255,6 +260,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %{_metainfodir}/%{name}-fonts.metainfo.xml %changelog +* Sun Jun 14 2020 Luya Tshimbalanga - 1:2.83.0-1.1 +- Temporarily exclude ARM architecture (#1843100) + * Wed Jun 03 2020 Luya Tshimbalanga - 1:2.83.0-1 - Update to 2.83.0 (#1843623) - Clean up spec file diff --git a/sources b/sources index 5071060..197354f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (blender-2.83.0.tar.xz) = 91a6b1997c2620e84e290fb7036d9dc148481187801f8b80dcb1ca958dc8300a8327e74c41fcdcfbb4d6d9f2691175cd78fc4c91c68b72b17f971a9d1fed52ce -SHA512 (blender-2.83-droid.patch) = 1c7dd11fc506f495167ab0ad33f532faa9ed13d30aa521a7795f6f39408686d4653807acbd0b6c20adb637777a824369c6657c77a4e42f58e0f7db3f340fedb2