[blender] First non-beta release of the 2.5 series (taken from svn)
Jochen Schmitt
s4504kr at fedoraproject.org
Thu Apr 14 15:54:00 UTC 2011
commit 2939933f7837447a4fd14f7e0ac026c30f2543d8
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Thu Apr 14 17:54:17 2011 +0200
First non-beta release of the 2.5 series (taken from svn)
.gitignore | 1 +
blender-2.56-ext.patch => blender-2.57-ext.patch | 86 ++++++++++------------
blender.spec | 67 +++++++++++++----
macros.blender | 4 +
sources | 2 +-
5 files changed, 96 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d54520..5dabe38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ blender-2.49b-repack.tar.bz2
/blender-2.56-beta.tar.gz
/blender-2.56.svn35722.tar.bz2
/blender-2.56.svn36007.tar.bz2
+/blender-2.57.svn36147.tar.bz2
diff --git a/blender-2.56-ext.patch b/blender-2.57-ext.patch
similarity index 59%
rename from blender-2.56-ext.patch
rename to blender-2.57-ext.patch
index f72caf6..5a6fd85 100644
--- a/blender-2.56-ext.patch
+++ b/blender-2.57-ext.patch
@@ -1,6 +1,7 @@
-diff -up blender/intern/ghost/SConscript.ext blender/intern/ghost/SConscript
---- blender/intern/ghost/SConscript.ext 2011-03-30 18:27:34.017803998 +0200
-+++ blender/intern/ghost/SConscript 2011-03-30 18:27:34.020804004 +0200
+diff -up blender/.ext.orig blender/.ext
+diff -up blender/intern/ghost/SConscript.orig blender/intern/ghost/SConscript
+--- blender/intern/ghost/SConscript.orig 2011-04-14 16:50:22.000000000 +0200
++++ blender/intern/ghost/SConscript 2011-04-14 17:17:52.595540001 +0200
@@ -60,7 +60,7 @@ else:
if env['BF_GHOST_DEBUG']:
defs.append('BF_GHOST_DEBUG')
@@ -10,21 +11,10 @@ diff -up blender/intern/ghost/SConscript.ext blender/intern/ghost/SConscript
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
-diff -up blender/source/blender/editors/include/BIF_gl.h.ext blender/source/blender/editors/include/BIF_gl.h
---- blender/source/blender/editors/include/BIF_gl.h.ext 2011-03-30 18:45:25.993804002 +0200
-+++ blender/source/blender/editors/include/BIF_gl.h 2011-03-30 18:45:53.857803973 +0200
-@@ -35,7 +35,7 @@
- #ifndef BIF_GL_H
- #define BIF_GL_H
-
--#include "../../../../extern/glew/include/GL/glew.h"
-+#include <GL/glew.h>
-
- /*
- * these should be phased out. cpack should be replaced in
-diff -up blender/source/blender/editors/space_console/SConscript.ext blender/source/blender/editors/space_console/SConscript
---- blender/source/blender/editors/space_console/SConscript.ext 2011-03-30 18:27:31.117804004 +0200
-+++ blender/source/blender/editors/space_console/SConscript 2011-03-30 18:27:31.119804004 +0200
+diff -up blender/source/blender/editors/include/BIF_gl.h.orig blender/source/blender/editors/include/BIF_gl.h
+diff -up blender/source/blender/editors/space_console/SConscript.orig blender/source/blender/editors/space_console/SConscript
+--- blender/source/blender/editors/space_console/SConscript.orig 2011-04-14 16:54:38.000000000 +0200
++++ blender/source/blender/editors/space_console/SConscript 2011-04-14 17:17:52.632540001 +0200
@@ -6,7 +6,7 @@ defs = []
incs = [
@@ -34,9 +24,9 @@ diff -up blender/source/blender/editors/space_console/SConscript.ext blender/sou
'#/intern/guardedalloc',
'../../makesdna',
'../../makesrna',
-diff -up blender/source/blender/editors/space_node/SConscript.ext blender/source/blender/editors/space_node/SConscript
---- blender/source/blender/editors/space_node/SConscript.ext 2011-03-30 18:27:31.558804005 +0200
-+++ blender/source/blender/editors/space_node/SConscript 2011-03-30 18:27:31.561804000 +0200
+diff -up blender/source/blender/editors/space_node/SConscript.orig blender/source/blender/editors/space_node/SConscript
+--- blender/source/blender/editors/space_node/SConscript.orig 2011-04-14 16:55:34.000000000 +0200
++++ blender/source/blender/editors/space_node/SConscript 2011-04-14 17:17:52.640540001 +0200
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
@@ -46,9 +36,9 @@ diff -up blender/source/blender/editors/space_node/SConscript.ext blender/source
defs = []
cf = []
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-diff -up blender/source/blender/python/SConscript.ext blender/source/blender/python/SConscript
---- blender/source/blender/python/SConscript.ext 2011-03-30 18:27:30.524804012 +0200
-+++ blender/source/blender/python/SConscript 2011-03-30 18:27:30.526804007 +0200
+diff -up blender/source/blender/python/SConscript.orig blender/source/blender/python/SConscript
+--- blender/source/blender/python/SConscript.orig 2011-04-14 16:53:04.000000000 +0200
++++ blender/source/blender/python/SConscript 2011-04-14 17:17:52.649540001 +0200
@@ -6,7 +6,7 @@ Import ('env')
incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes'
@@ -58,9 +48,9 @@ diff -up blender/source/blender/python/SConscript.ext blender/source/blender/pyt
incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG'])
-diff -up blender/source/gameengine/BlenderRoutines/SConscript.ext blender/source/gameengine/BlenderRoutines/SConscript
---- blender/source/gameengine/BlenderRoutines/SConscript.ext 2011-03-30 18:27:33.144804003 +0200
-+++ blender/source/gameengine/BlenderRoutines/SConscript 2011-03-30 18:27:33.147804000 +0200
+diff -up blender/source/gameengine/BlenderRoutines/SConscript.orig blender/source/gameengine/BlenderRoutines/SConscript
+--- blender/source/gameengine/BlenderRoutines/SConscript.orig 2011-04-14 16:52:05.000000000 +0200
++++ blender/source/gameengine/BlenderRoutines/SConscript 2011-04-14 17:17:52.659540001 +0200
@@ -19,7 +19,7 @@ incs += ' #source/gameengine/SceneGraph
incs += ' #source/gameengine/Physics/Bullet'
incs += ' #source/gameengine/Network/LoopBackNetwork'
@@ -70,9 +60,9 @@ diff -up blender/source/gameengine/BlenderRoutines/SConscript.ext blender/source
incs += ' #source/blender/windowmanager'
if env['WITH_BF_FFMPEG']:
-diff -up blender/source/gameengine/GamePlayer/common/SConscript.ext blender/source/gameengine/GamePlayer/common/SConscript
---- blender/source/gameengine/GamePlayer/common/SConscript.ext 2011-03-30 18:27:33.226804023 +0200
-+++ blender/source/gameengine/GamePlayer/common/SConscript 2011-03-30 18:27:33.228804012 +0200
+diff -up blender/source/gameengine/GamePlayer/common/SConscript.orig blender/source/gameengine/GamePlayer/common/SConscript
+--- blender/source/gameengine/GamePlayer/common/SConscript.orig 2011-04-14 16:52:13.000000000 +0200
++++ blender/source/gameengine/GamePlayer/common/SConscript 2011-04-14 17:17:52.669540001 +0200
@@ -43,7 +43,7 @@ incs = ['.',
'#source/blender/misc',
'#source/blender/blenloader',
@@ -82,9 +72,9 @@ diff -up blender/source/gameengine/GamePlayer/common/SConscript.ext blender/sour
defs = [ 'GLEW_STATIC' ]
-diff -up blender/source/gameengine/GamePlayer/ghost/SConscript.ext blender/source/gameengine/GamePlayer/ghost/SConscript
---- blender/source/gameengine/GamePlayer/ghost/SConscript.ext 2011-03-30 18:27:33.182804003 +0200
-+++ blender/source/gameengine/GamePlayer/ghost/SConscript 2011-03-30 18:27:33.184804003 +0200
+diff -up blender/source/gameengine/GamePlayer/ghost/SConscript.orig blender/source/gameengine/GamePlayer/ghost/SConscript
+--- blender/source/gameengine/GamePlayer/ghost/SConscript.orig 2011-04-14 16:52:05.000000000 +0200
++++ blender/source/gameengine/GamePlayer/ghost/SConscript 2011-04-14 17:17:52.679540001 +0200
@@ -39,7 +39,7 @@ incs = ['.',
'#source/blender/misc',
'#source/blender/blenloader',
@@ -94,9 +84,9 @@ diff -up blender/source/gameengine/GamePlayer/ghost/SConscript.ext blender/sourc
defs = [ 'GLEW_STATIC' ]
-diff -up blender/source/gameengine/Ketsji/SConscript.ext blender/source/gameengine/Ketsji/SConscript
---- blender/source/gameengine/Ketsji/SConscript.ext 2011-03-30 18:27:33.077804003 +0200
-+++ blender/source/gameengine/Ketsji/SConscript 2011-03-30 18:27:33.080804004 +0200
+diff -up blender/source/gameengine/Ketsji/SConscript.orig blender/source/gameengine/Ketsji/SConscript
+--- blender/source/gameengine/Ketsji/SConscript.orig 2011-04-14 16:52:30.000000000 +0200
++++ blender/source/gameengine/Ketsji/SConscript 2011-04-14 17:17:52.689540001 +0200
@@ -18,7 +18,7 @@ incs += ' #source/blender/makesdna #sour
incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network'
incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
@@ -106,9 +96,9 @@ diff -up blender/source/gameengine/Ketsji/SConscript.ext blender/source/gameengi
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']
-diff -up blender/source/gameengine/Physics/Bullet/SConscript.ext blender/source/gameengine/Physics/Bullet/SConscript
---- blender/source/gameengine/Physics/Bullet/SConscript.ext 2011-03-30 18:27:32.884804005 +0200
-+++ blender/source/gameengine/Physics/Bullet/SConscript 2011-03-30 18:27:32.886804004 +0200
+diff -up blender/source/gameengine/Physics/Bullet/SConscript.orig blender/source/gameengine/Physics/Bullet/SConscript
+--- blender/source/gameengine/Physics/Bullet/SConscript.orig 2011-04-14 16:52:04.000000000 +0200
++++ blender/source/gameengine/Physics/Bullet/SConscript 2011-04-14 17:17:52.699540001 +0200
@@ -7,7 +7,7 @@ incs = '. ../common'
incs += ' #source/kernel/gen_system'
incs += ' #intern/string'
@@ -118,9 +108,9 @@ diff -up blender/source/gameengine/Physics/Bullet/SConscript.ext blender/source/
incs += ' #source/gameengine/Rasterizer'
incs += ' #source/gameengine/Ketsji'
incs += ' #source/gameengine/Expressions'
-diff -up blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
---- blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext 2011-03-30 18:27:33.559804003 +0200
-+++ blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2011-03-30 18:27:33.562804001 +0200
+diff -up blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.orig blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+--- blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.orig 2011-04-14 16:52:33.000000000 +0200
++++ blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2011-04-14 17:17:52.708540001 +0200
@@ -6,7 +6,7 @@ sources = env.Glob('*.cpp')
defs = [ 'GLEW_STATIC' ]
@@ -130,9 +120,9 @@ diff -up blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ex
incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
incs += ' #intern/guardedalloc #source/blender/blenlib'
-diff -up blender/source/gameengine/Rasterizer/SConscript.ext blender/source/gameengine/Rasterizer/SConscript
---- blender/source/gameengine/Rasterizer/SConscript.ext 2011-03-30 18:27:33.505804004 +0200
-+++ blender/source/gameengine/Rasterizer/SConscript 2011-03-30 18:27:33.507804003 +0200
+diff -up blender/source/gameengine/Rasterizer/SConscript.orig blender/source/gameengine/Rasterizer/SConscript
+--- blender/source/gameengine/Rasterizer/SConscript.orig 2011-04-14 16:52:33.000000000 +0200
++++ blender/source/gameengine/Rasterizer/SConscript 2011-04-14 17:17:52.717540001 +0200
@@ -4,7 +4,7 @@ Import ('env')
sources = env.Glob('*.cpp')
@@ -142,9 +132,9 @@ diff -up blender/source/gameengine/Rasterizer/SConscript.ext blender/source/game
defs = [ 'GLEW_STATIC' ]
-diff -up blender/source/gameengine/VideoTexture/SConscript.ext blender/source/gameengine/VideoTexture/SConscript
---- blender/source/gameengine/VideoTexture/SConscript.ext 2011-03-30 18:27:33.112804003 +0200
-+++ blender/source/gameengine/VideoTexture/SConscript 2011-03-30 18:27:33.114804003 +0200
+diff -up blender/source/gameengine/VideoTexture/SConscript.orig blender/source/gameengine/VideoTexture/SConscript
+--- blender/source/gameengine/VideoTexture/SConscript.orig 2011-04-14 16:52:20.000000000 +0200
++++ blender/source/gameengine/VideoTexture/SConscript 2011-04-14 17:17:52.727540001 +0200
@@ -12,7 +12,7 @@ incs += ' #source/gameengine/BlenderRout
incs += ' #source/blender/editors/include #source/blender/blenlib #source/blender/blenkernel'
incs += ' #source/blender/makesdna #source/blender/imbuf #source/blender/python #source/blender/python/generic'
diff --git a/blender.spec b/blender.spec
index 3a2eec3..e57a60c 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,13 +1,14 @@
-%global blenderlib %{_datadir}/blender/2.56
-%global blenderarch %{_libdir}/blender
+%global blenderlib %{_datadir}/blender/%{version}
+# %global blenderarch %{_libdir}/blender
%global __python %{__python3}
-%global svn .svn36007
+%global svn .svn36147
%global fontname blender
Name: blender
-Version: 2.56
-Release: 11%{svn}%{?dist}
+Epoch: 1
+Version: 2.57
+Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -19,14 +20,17 @@ URL: http://www.blender.org
# Upstream tar ball was created von upstream svn repository
# using revision 35722
-Source0: blender-2.56%{svn}.tar.bz2
+Source0: blender-2.57%{svn}.tar.bz2
Source5: blender.xml
Source8: blender-2.56.config
+
+Source10: macros.blender
+
Source100: blender-repack.sh
Patch1: blender-2.44-bid.patch
-Patch2: blender-2.56-ext.patch
+Patch2: blender-2.57-ext.patch
Patch3: blender-2.56-syspath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,7 +71,7 @@ Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
Requires(postun): shared-mime-info
-Requires: blender-fonts = %{version}-%{release}
+Requires: blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?fedora} > 10
Requires: dejavu-sans-fonts
@@ -77,7 +81,7 @@ Requires: dejavu-sans-fonts
Requires: dejavu-fonts
%endif
-Provides: blender-fonts = %{version}-%{release}
+Provides: blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: blender-fonts <= 2.48a-9
%description
@@ -96,6 +100,14 @@ This package contains a stand alone release of the blender player.
You will need this package to play games which are based on the
Blender Game Engine.
+%package rpm-macros
+Summary: RPM macros to build third-party blender addons packages
+Group: Development/Tools
+
+%description rpm-macros
+This package provides rpm macros to support the creation of third-party
+addon packages to extend blender.
+
%prep
%setup -q -n %{name}
%patch1 -p1 -b .bid
@@ -162,14 +174,14 @@ mkdir -p ${RPM_BUILD_ROOT}%{blenderlib}/scripts
# Create empty %%{_libdir}/blender/scripts to claim ownership
#
-mkdir -p ${RPM_BUILD_ROOT}%{blenderarch}/{scripts,plugins/sequence,plugins/texture}
+# mkdir -p ${RPM_BUILD_ROOT}%{blenderarch}/{scripts,plugins/sequence,plugins/texture}
#
# Install plugins
#
-install -pm 755 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/sequence
-install -pm 755 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/texture
+# install -pm 755 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/sequence
+# install -pm 755 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/texture
# find bin/.blender/locale -name '.svn' -exec rm -f {} ';'
@@ -183,12 +195,16 @@ 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' {} \;
# Install hicolor icons.
-for i in 16x16 22x22 32x32 ; do
+for i in 16x16 22x22 32x32 48x48 64x64 96x96 128x128 192x192 ; do
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${i}/apps
install -pm 0644 release/freedesktop/icons/${i}/%{name}.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${i}/apps/%{name}.png
done
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/scalable/apps
+install -pm 0644 release/freedesktop/icons/scalable/%{name}.svg \
+ ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+
install -p -D -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
desktop-file-install --vendor fedora \
@@ -198,6 +214,15 @@ desktop-file-install --vendor fedora \
# Plugins are not support now
rm -rf ${RPM_BUILD_ROOT}%{blenderarch}/plugins/*
+#
+# rpm macros
+#
+
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
+
+sed -e 's/@VERSION@/%{version}/g' %{SOURCE10} \
+ >${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/macros.blender
+
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -224,8 +249,8 @@ fi || :
%{_bindir}/blender
# %{_bindir}/blender.bin
%{_datadir}/applications/fedora-blender.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{blenderarch}/
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+# %{blenderarch}/
%{blenderlib}/
%{_datadir}/mime/packages/blender.xml
@@ -234,7 +259,19 @@ fi || :
%doc COPYING
%{_bindir}/blenderplayer
+%files rpm-macros
+%defattr(-,root,root,-)
+%{_sysconfdir}/rpm/macros.blender
+
%changelog
+* Thu Apr 14 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.57-1
+- First non-beta release of the 2.5 series (taken from svn)
+
+* Wed Apr 13 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.56-12.svn36007%{?dist}
+- Increase Epoch
+- Add rpm-macros subpackage
+- Exclude currently unsed directories (plugin support)
+
* Sun Apr 10 2011 Jochen Schmitt <Jochen herr-schmitt de> 2.56-11.svn36007%{?dist}
- Add accidently removed files
diff --git a/macros.blender b/macros.blender
new file mode 100644
index 0000000..88f941a
--- /dev/null
+++ b/macros.blender
@@ -0,0 +1,4 @@
+%blender_version @VERSION@
+
+%blender_libdir %{_datadir}/blender/%{blender_version}
+%blender_archdir %{_libdir}/blender/%{blender_version}
diff --git a/sources b/sources
index cb63d70..d103d3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64591484279227dbbc5cbf4c26d7abdf blender-2.56.svn36007.tar.bz2
+a48c218f9eff50e55a7a8161a90802e2 blender-2.57.svn36147.tar.bz2
More information about the scm-commits
mailing list