rpms/blender/devel blender-2.49.config, 1.2, 1.3 blender-wrapper, 1.10, 1.11 blender.spec, 1.113, 1.114
Jochen Schmitt
s4504kr at fedoraproject.org
Tue Jun 2 20:13:47 UTC 2009
Author: s4504kr
Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2839
Modified Files:
blender-2.49.config blender-wrapper blender.spec
Log Message:
Try to build agains more system libraries as possible
Index: blender-2.49.config
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-2.49.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blender-2.49.config 2 Jun 2009 16:56:01 -0000 1.2
+++ blender-2.49.config 2 Jun 2009 20:13:15 -0000 1.3
@@ -50,9 +50,9 @@ BF_GETTEXT_LIB = 'gettextlib'
BF_GETTEXT_LIBPATH = '@LIB@'
WITH_BF_FTGL = 'true'
-BF_FTGL = '/usr'
-BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
-BF_FTGL_LIB = 'ftgl'
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include/'
+BF_FTGL_LIB = 'extern_ftgl'
WITH_BF_GAMEENGINE='true'
Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-wrapper,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- blender-wrapper 13 May 2009 17:52:59 -0000 1.10
+++ blender-wrapper 2 Jun 2009 20:13:15 -0000 1.11
@@ -6,11 +6,7 @@
# In case user's home directory doesn't contain ~/.blender, copy it
# from /usr/share/blender
-if [ -x /usr/bin/blender-freeworld.bin ]; then
- blend="blender-freeworld"
-else
- blend="blender"
-fi
+blend="blender"
if [ ! -d ~/.blender ]; then
install -d ~/.blender
@@ -38,7 +34,7 @@ if [ ! -d ~/.blender ]; then
if [ -d /usr/lib64/$blend/plugins ]; then
ln -sf /usr/lib64/$blend/plugins/sequence ~/.blender/plugins/sequence
- ln -sf /usr/lib64/$blend/plugins/texture ~/.blender/plugin/textrure
+ ln -sf /usr/lib64/$blend/plugins/texture ~/.blender/plugin/texture
fi
fi
Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- blender.spec 2 Jun 2009 16:56:01 -0000 1.113
+++ blender.spec 2 Jun 2009 20:13:15 -0000 1.114
@@ -5,7 +5,7 @@
Name: blender
Version: 2.49
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -32,6 +32,7 @@ Source8: blender-2.49.config
Patch1: blender-2.49-scons.patch
Patch2: blender-2.44-bid.patch
+# Both patches are forwarded to upstream via email
Patch100: blender-2.46rc3-cve-2008-1103-1.patch
Patch101: blender-2.48a-cve-2008-4863.patch
@@ -63,10 +64,10 @@ BuildRequires: glew-devel
BuildRequires: fontpackages-devel
BuildRequires: fftw-devel
-BuildRequires: ftgl-devel
+#BuildRequires: ftgl-devel
BuildRequires: ode-devel
BuildRequires: openjpeg-devel
-
+#BuildRequires: qhull-devel
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
@@ -112,11 +113,11 @@ Blender Geaming Engine.
%patch100 -p1
%patch101 -p1
+#rm -rf extern/bFTGL
rm -rf extern/fftw
-rm -rf extern/ftgl
rm -rf extern/glew
rm -rf extern/libopenjpeg
-rm -rf extern/libredcode
+#rm -rf extern/qhull
rm -rf extern/ode
rm -rf extern/xvidcore
@@ -241,7 +242,7 @@ update-desktop-database %{_datadir}/appl
%{_bindir}/blenderplayer.bin
%changelog
-* Tue Jun 2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-2
+* Tue Jun 2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-3
- Try to build agains more system libraries as possible
* Mon Jun 1 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-1
More information about the fedora-extras-commits
mailing list