[blender] Aboid twice occurance of locale files

[Jochen Schmitt]

commit 55a1ca121e63357575289fcd6aaa0f781515cb33
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sun Sep 1 20:20:25 2013 +0200

    Aboid twice occurance of locale files
    
    - Fix typo in DroideSans font name

 blender-2.67-syspath.patch                         |   12 -----------
 ...r-2.67-droid.patch => blender-2.68a-droid.patch |    2 +-
 blender-2.68a-syspath.patch                        |   12 +++++++++++
 blender.spec                                       |   21 ++++++++++++-------
 4 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/blender-2.67-droid.patch b/blender-2.68a-droid.patch
similarity index 98%
rename from blender-2.67-droid.patch
rename to blender-2.68a-droid.patch
index a23fe81..fa4c6f7 100644
--- a/blender-2.67-droid.patch
+++ b/blender-2.68a-droid.patch
@@ -6,7 +6,7 @@ diff -up blender-2.67/source/blender/blenfont/intern/blf_translation.c.droid ble
  #include "boost_locale_wrapper.h"
  
 -static const char unifont_filename[] = "droidsans.ttf.gz";
-+static const char unifont_filename[] = "droidsans.ttf";
++static const char unifont_filename[] = "DroidSans.ttf";
  static unsigned char *unifont_ttf = NULL;
  static int unifont_size = 0;
  static const char unifont_mono_filename[] = "bmonofont-i18n.ttf.gz";
diff --git a/blender-2.68a-syspath.patch b/blender-2.68a-syspath.patch
new file mode 100644
index 0000000..5545b6b
--- /dev/null
+++ b/blender-2.68a-syspath.patch
@@ -0,0 +1,12 @@
+diff -up blender-2.68a/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.68a/source/blender/blenfont/intern/blf_lang.c
+--- blender-2.68a/source/blender/blenfont/intern/blf_lang.c.syspath	2013-06-21 14:33:19.000000000 +0200
++++ blender-2.68a/source/blender/blenfont/intern/blf_lang.c	2013-09-01 15:58:24.422656833 +0200
+@@ -186,7 +186,7 @@ EnumPropertyItem *BLF_RNA_lang_enum_prop
+ void BLF_lang_init(void)
+ {
+ #ifdef WITH_INTERNATIONAL
+-	const char * const messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
++  const char * const messagepath = "/usr/share/locale";
+ 
+ 	if (messagepath) {
+ 		bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
diff --git a/blender.spec b/blender.spec
index 609a870..4c5cf27 100644
--- a/blender.spec
+++ b/blender.spec
@@ -14,7 +14,7 @@
 Name:           blender
 Epoch:          1
 Version:        %{blender_api}a
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -28,9 +28,8 @@ Source5:        blender.xml
 
 Source10:       macros.blender
 
-Patch1:         blender-2.67-syspath.patch
-Patch2:	        blender-2.67-droid.patch
-Patch3:		blender-2.67b-rna.patch
+Patch1:         blender-2.68a-syspath.patch
+Patch2:	        blender-2.68a-droid.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -148,7 +147,6 @@ sets.
  
 %patch1 -p1 -b .syspath
 %patch2 -p1 -b .droid
-%patch3 -p1 -b .rna
 
 find -name '.svn' -print | xargs rm -rf
 
@@ -233,6 +231,11 @@ rm -rf ${RPM_BUILD_ROOT}%{_bindir}/blender-thumbnailer.py
 
 rm -rf ${RPM_BUILD_ROOT}%{_docdir}/blender/*
 
+rm -rf ${RPM_BUILD_ROOT}/%{blenderlib}/datafiles/locale/*
+cp -a release/datafiles/locale/languages ${RPM_BUILD_ROOT}/%{blenderlib}/datafiles/locale/
+
+rm -rf ${RPM_BUILD_ROOT}/%{blenderlib}/datafiles/fonts
+
 #
 # rpm macros
 #
@@ -242,9 +245,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
 sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} \
      >${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/macros.blender
 
-mv ${RPM_BUILD_ROOT}/%{_datadir}/locale/languages \
-   ${RPM_BUILD_ROOT}/%{_datadir}/blender/
-
+rm ${RPM_BUILD_ROOT}/%{_datadir}/locale/languages
 
 mkdir -p ${RPM_BUILD_ROOT}/%{blender_fontdir}/
 cp -p release/datafiles/fonts/bmonofont-i18n.ttf.gz \
@@ -295,6 +296,10 @@ fi || :
 %doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
 
 %changelog
+* Sun Sep  1 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.68a-4
+- Aboid twice occurance of locale files
+- Fix typo in DroideSans font name
+
 * Wed Aug 28 2013 François Cami <fcami at fedoraproject.org> - 1:2.68a-3
 - Enable jemalloc and OpenColorIO. (#1002197)
 - Re-enable localization (#867285)