diff --git a/.gitignore b/.gitignore index 33c023d..1d53c90 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ blender-2.49b-repack.tar.bz2 /blender-2.67b.tar.gz /blender-2.68a.tar.gz /blender-2.69.tar.gz +/blender-2.70.tar.gz diff --git a/blender-2.68a-syspath.patch b/blender-2.68a-syspath.patch deleted file mode 100644 index 5545b6b..0000000 --- a/blender-2.68a-syspath.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 223885f..16d8bbb 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.69 +%global blender_api 2.70 %global blender_fontdir %{_fontbasedir}/blender # [Fedora] Turn off the brp-python-bytecompile script @@ -16,7 +16,7 @@ Name: blender Epoch: 1 Version: %{blender_api} -Release: 7%{?dist} +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -30,7 +30,6 @@ Source5: blender.xml Source10: macros.blender -Patch1: blender-2.68a-syspath.patch Patch2: blender-2.68a-droid.patch BuildRequires: desktop-file-utils @@ -147,7 +146,6 @@ sets. %prep %setup -q -%patch1 -p1 -b .syspath %patch2 -p1 -b .droid find -name '.svn' -print | xargs rm -rf @@ -200,8 +198,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{blenderarch}/{scripts,plugins/sequence,plugins/textu find release/datafiles/locale -name '.svn' -exec rm -f {} ';' -cp -a release/datafiles/locale ${RPM_BUILD_ROOT}%{_datadir} - cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts find ${RPM_BUILD_ROOT}%{blenderlib}/scripts -type f -exec sed -i -e 's/\r$//g' {} \; @@ -236,8 +232,7 @@ 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/ +cp -aR release/datafiles/locale ${RPM_BUILD_ROOT}/%{blenderlib}/datafiles/ rm -rf ${RPM_BUILD_ROOT}/%{blenderlib}/datafiles/fonts @@ -250,14 +245,10 @@ mkdir -p ${RPM_BUILD_ROOT}%{macrosdir} sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} \ >${RPM_BUILD_ROOT}%{macrosdir}/macros.blender -rm ${RPM_BUILD_ROOT}/%{_datadir}/locale/languages - mkdir -p ${RPM_BUILD_ROOT}/%{blender_fontdir}/ cp -p release/datafiles/fonts/*.ttf.gz \ ${RPM_BUILD_ROOT}%{blender_fontdir}/ -%find_lang %{name} - %post %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor @@ -274,7 +265,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi || : -%files -f blender.lang +%files %defattr(-,root,root,-) %{_bindir}/blender %{_datadir}/applications/blender.desktop @@ -301,6 +292,9 @@ fi || : %doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt %changelog +* Thu Mar 20 2014 Jochen Schmitt - 1:2.70-1 +- New upstream releasw + * Sun Mar 9 2014 Jochen Schmitt - 1:2.69-7 - Use new rpm macro for rpm macro direcgory (#1074263) diff --git a/sources b/sources index 250c33b..60416e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e77f53951fdaea69631cdd8c0f42cbcb blender-2.69.tar.gz +229a61b8c3b4fd1c9b45961d559c0cbd blender-2.70.tar.gz