Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2013-05-02 11:05:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2013-03-26 12:20:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2013-05-02 11:05:59.000000000 +0200 @@ -1,0 +2,14 @@ +Wed May 1 19:17:37 UTC 2013 - [email protected] + +- Update to version 2.66a +- Removed blender-2.64a-big-endian.patch and + blender-2.64a-libpng16.patch, fixed upstream. +- Upstream bug fixes see : + http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66a +- Upstream changes for 2.66 see : + http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66 +- Upstream changes since 2.64a see : + http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65 and + http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65a + +------------------------------------------------------------------- Old: ---- Changes.txt blender-2.64a-big-endian.patch blender-2.64a-libpng16.patch blender-2.64a.tar.gz blenderplayer.1 New: ---- blender-2.66a.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.NbWGVd/_old 2013-05-02 11:06:04.000000000 +0200 +++ /var/tmp/diff_new_pack.NbWGVd/_new 2013-05-02 11:06:04.000000000 +0200 @@ -24,28 +24,25 @@ %define DISTRIBUTABLE 1 Name: blender -Version: 2.64a +Version: 2.66a Release: 0 -%define _version 2.64 +%define _version 2.66 Summary: A 3D Modelling And Rendering Package License: GPL-2.0+ Group: Productivity/Graphics/3D Editors Url: http://www.blender.org/ - -Source0: http://download.blender.org/source/%{name}-%{version}.tar.gz -Source1: Changes.txt +# http://download.blender.org/source/ +Source0: %{name}-%{version}.tar.gz Source2: geeko.blend Source3: geeko.README Source4: blender-sample -Source5: blenderplayer.1 Source6: blender.xpm Source7: x-blend.desktop Source8: blender-getversion.py -Patch0: blender-%{version}-fix-locale-files-path.patch +# Fixed and refreshed for 2.66a. +Patch0: blender-2.64a-fix-locale-files-path.patch +# Refreshed for 2.66a Patch1: blender-2.58-python_include.patch -Patch2: blender-2.64a-big-endian.patch -# fix build against libpng16, upstream notified via #blendercoders -Patch3: blender-2.64a-libpng16.patch BuildRequires: gettext-tools %if 0%{?suse_version} > 1210 BuildRequires: libGLw-devel @@ -78,7 +75,7 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: libao-devel BuildRequires: libdrm-devel -BuildRequires: libjpeg8-devel +BuildRequires: libjpeg-devel BuildRequires: liblcms-devel BuildRequires: libpng-devel BuildRequires: libsamplerate-devel @@ -149,10 +146,8 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch0 +%patch1 %if %DISTRIBUTABLE == 1 rm -rf release/scripts/presets/ffmpeg @@ -255,8 +250,6 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ install -D -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/ install -D -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/ -# Add Changes.txt -cp -v %{SOURCE1} %{buildroot}%{_docdir}/%{name}/ %if 1 == 1 # Add more icons. @@ -294,6 +287,7 @@ %fdupes %{buildroot}%{_datadir}/%{name}/%{_version}/scripts/ %find_lang %{name} %{?no_lang_C} +rm -rf %{buildroot}%{_datadir}/locale/languages %post update-desktop-database &> /dev/null || : @@ -325,6 +319,7 @@ %{_datadir}/pixmaps/blender.svg %{_datadir}/pixmaps/blender.xpm %{_datadir}/pixmaps/blender.png +#%%exclude %%{_datadir}/%%{name}%%{rlversion}/datafiles/locale %if %documentation == 0 %doc %{_docdir}/%{name} %else ++++++ blender-2.58-python_include.patch ++++++ --- /var/tmp/diff_new_pack.NbWGVd/_old 2013-05-02 11:06:04.000000000 +0200 +++ /var/tmp/diff_new_pack.NbWGVd/_new 2013-05-02 11:06:04.000000000 +0200 @@ -1,13 +1,12 @@ -diff -Naur blender-2.58.orig/CMakeLists.txt blender-2.58/CMakeLists.txt ---- blender-2.58.orig/CMakeLists.txt 2011-08-05 14:45:26.776618379 -0500 -+++ blender-2.58/CMakeLists.txt 2011-08-05 14:47:21.562887635 -0500 -@@ -307,6 +307,7 @@ - # Use our own instead, since wothout py is such a rare case, - # require this package +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig 2013-02-07 16:10:01.000000000 +0200 ++++ CMakeLists.txt 2013-04-30 07:54:34.648195498 +0200 +@@ -550,6 +550,7 @@ if(UNIX AND NOT APPLE) + # XXX Linking errors with debian static python :/ + # find_package_wrapper(PythonLibsUnix REQUIRED) find_package(PythonLibsUnix REQUIRED) + set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) endif() - - - + if(WITH_IMAGE_OPENEXR) ++++++ blender-2.64a-fix-locale-files-path.patch ++++++ --- /var/tmp/diff_new_pack.NbWGVd/_old 2013-05-02 11:06:04.000000000 +0200 +++ /var/tmp/diff_new_pack.NbWGVd/_new 2013-05-02 11:06:04.000000000 +0200 @@ -1,8 +1,8 @@ -Index: blender-2.64a/source/creator/CMakeLists.txt +Index: source/creator/CMakeLists.txt =================================================================== ---- blender-2.64a.orig/source/creator/CMakeLists.txt -+++ blender-2.64a/source/creator/CMakeLists.txt -@@ -294,11 +294,16 @@ +--- source/creator/CMakeLists.txt.orig 2013-05-01 22:32:06.000000000 +0200 ++++ source/creator/CMakeLists.txt 2013-05-01 22:33:27.049051615 +0200 +@@ -294,11 +294,16 @@ endif() if(WITH_INTERNATIONAL) install( DIRECTORY @@ -20,10 +20,10 @@ endif() # color management -Index: blender-2.64a/release/environment-unix +Index: release/environment-unix =================================================================== ---- blender-2.64a.orig/release/environment-unix -+++ blender-2.64a/release/environment-unix +--- release/environment-unix.orig 2013-05-01 22:32:06.000000000 +0200 ++++ release/environment-unix 2013-05-01 22:33:27.060051615 +0200 @@ -11,7 +11,7 @@ BLENDER_USER_BASE=${HOME}/.blender/${BLENDER_VERSION} BLENDER_SYSTEM_BASE=${BLENDER_SHARE}/${BLENDER_VERSION} @@ -33,34 +33,11 @@ BLENDER_USER_PY=${HOME}/.blender/${BLENDER_VERSION}/py BLENDER_SYSTEM_PY=${BLENDER_SHARE}/${BLENDER_VERSION}/py BLENDER_USER_PLUGINS=${HOME}/.blender/${BLENDER_VERSION}/plugins -Index: blender-2.63a/source/blender/blenfont/intern/blf_lang.c +Index: source/blender/blenlib/intern/path_util.c =================================================================== ---- blender-2.64a.orig/source/blender/blenfont/intern/blf_lang.c -+++ blender-2.64a/source/blender/blenfont/intern/blf_lang.c -@@ -113,17 +113,7 @@ - - void BLF_lang_init(void) - { -- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale"); -- -- BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name)); -- -- if (messagepath) { -- BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath)); -- } -- else { -- printf("%s: 'locale' data path for translations not found, continuing\n", __func__); -- global_messagepath[0] = '\0'; -- } -+ *global_messagepath = "/usr/share/locale/"; - } - - /* Get LANG/LANGUAGE environment variable. */ -Index: blender-2.64a/source/blender/blenlib/intern/path_util.c -=================================================================== ---- blender-2.64a.orig/source/blender/blenlib/intern/path_util.c -+++ blender-2.64a/source/blender/blenlib/intern/path_util.c -@@ -983,38 +983,6 @@ +--- source/blender/blenlib/intern/path_util.c.orig 2013-05-01 22:32:06.000000000 +0200 ++++ source/blender/blenlib/intern/path_util.c 2013-05-01 22:33:27.065051615 +0200 +@@ -989,38 +989,6 @@ static int get_path_system(char *targetp char system_path[FILE_MAX]; const char *system_base_path; @@ -99,4 +76,3 @@ system_path[0] = '\0'; if (test_env_path(system_path, envvar)) { - ++++++ blender-2.64a.tar.gz -> blender-2.66a.tar.gz ++++++ /work/SRC/openSUSE:Factory/blender/blender-2.64a.tar.gz /work/SRC/openSUSE:Factory/.blender.new/blender-2.66a.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
