rpms/blender/devel blender-wrapper, 1.11, 1.12 blender.spec, 1.114, 1.115

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28188

Modified Files:
	blender-wrapper blender.spec 
Log Message:
Rework on the blender wrapper script


Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-wrapper,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- blender-wrapper	2 Jun 2009 20:13:15 -0000	1.11
+++ blender-wrapper	3 Jun 2009 15:40:01 -0000	1.12
@@ -6,7 +6,11 @@
 # In case user's home directory doesn't contain ~/.blender, copy it
 # from /usr/share/blender
 
-blend="blender"
+if [ -x /usr/bin/blender-freeworld.bin ]; then
+    blend="blender-freeworld"
+else
+    blend="blender"
+fi
 
 if [ ! -d ~/.blender ]; then
     install -d ~/.blender
@@ -32,9 +36,9 @@ if [ ! -d ~/.blender ]; then
     ln -sf /usr/share/blender/scripts/bpymodules ~/.blender/scripts/pbymodules
     ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
 
-    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/texture
+    if [ -d /usr/lib64/blender/plugins ]; then
+	ln -sf /usr/lib64/blender/plugins/sequence ~/.blender/plugins/sequence
+	ln -sf /usr/lib64/blender/plugins/texture ~/.blender/plugins/texture
     fi
 fi
 
@@ -75,12 +79,12 @@ elif [ -d /usr/lib/blender/scripts ] ; t
 fi
 
 
-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/plugins/texture
-elif [ -d /usr/lib/$blend/plugins ]; then
-    ln -sf /usr/lib/$blend/plugins/sequence ~/.blender/plugins/sequence
-    ln -sf /usr/lib/$blend/plugins/texture ~/.blender/plugins/texture    
+if [ -d /usr/lib64/blender/plugins ]; then
+    ln -sf /usr/lib64/blender/plugins/sequence ~/.blender/plugins/sequence
+    ln -sf /usr/lib64/blender/plugins/texture ~/.blender/plugins/texture
+elif [ -d /usr/lib/blender/plugins ]; then
+    ln -sf /usr/lib/blender/plugins/sequence ~/.blender/plugins/sequence
+    ln -sf /usr/lib/blender/plugins/texture ~/.blender/plugins/texture    
 fi
 
 /usr/bin/${blend}.bin $@


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- blender.spec	2 Jun 2009 20:13:15 -0000	1.114
+++ blender.spec	3 Jun 2009 15:40:01 -0000	1.115
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -242,6 +242,9 @@ update-desktop-database %{_datadir}/appl
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Wed Jun  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-4
+- Rework on the blender wrapper script
+
 * Tue Jun  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-3
 - Try to build agains more system libraries as possible