From 536efdc0a40975adf04a70f18e0b45538abfb444 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Apr 21 2017 07:11:34 +0000 Subject: Remove redundant fonts directory in blender-fonts package --- diff --git a/blender-2.76-droid.patch b/blender-2.76-droid.patch index e57b59c..a40cbed 100644 --- a/blender-2.76-droid.patch +++ b/blender-2.76-droid.patch @@ -6,7 +6,7 @@ diff -uNr blender-2.78c.orig/source/blender/blenfont/intern/blf_font_i18n.c blen #ifdef WITH_INTERNATIONAL if (unifont_ttf == NULL) { - const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); -+ const char * const fontpath = "/usr/share/fonts/blender/fonts"; ++ const char * const fontpath = "/usr/share/fonts/blender"; if (fontpath) { char unifont_path[1024]; @@ -15,7 +15,7 @@ diff -uNr blender-2.78c.orig/source/blender/blenfont/intern/blf_font_i18n.c blen #ifdef WITH_INTERNATIONAL if (unifont_mono_ttf == NULL) { - const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); -+ const char * const fontpath = "/usr/share/fonts/blender/fonts"; ++ const char * const fontpath = "/usr/share/fonts/blender"; if (fontpath) { char unifont_path[1024]; @@ -29,7 +29,7 @@ diff -uNr blender-2.78c.orig/source/creator/CMakeLists.txt blender-2.78c/source/ - DIRECTORY - ${CMAKE_SOURCE_DIR}/release/datafiles/fonts - DESTINATION ${TARGETDIR_VER}/datafiles -+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/fonts ++ DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/ + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender ) diff --git a/blender.spec b/blender.spec index 38cad79..66e4841 100644 --- a/blender.spec +++ b/blender.spec @@ -14,7 +14,7 @@ Name: blender Epoch: 1 Version: %{blender_api}c -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -284,6 +284,9 @@ fi %{_fontbasedir}/%{name}/ %changelog +* Fri Apr 21 2017 Simone Caronni - 1:2.78c-3 +- Remove redundant fonts directory in blender-fonts package. + * Mon Mar 06 2017 Luya Tshimbalanga - 1:2.78c-2 - Restore broken international fonts support (rhbz#1429196)