rpms/blender/F-10 blender-wrapper,1.5,1.6 blender.spec,1.91,1.92

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2024

Modified Files:
	blender-wrapper blender.spec 
Log Message:
Fix some issues with blender-wrapper


Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/F-10/blender-wrapper,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blender-wrapper	26 Oct 2008 20:38:52 -0000	1.5
+++ blender-wrapper	22 Mar 2009 20:42:04 -0000	1.6
@@ -17,8 +17,18 @@
     install -d ~/.blender/plugins/texture
 
     install -d ~/.blender/scripts
-    ln -sf /usr/share/blender/scripts/bpydata ~/blender/scripts/bpydata
-    ln -sf /usr/share/blender/scripts/bpymodules ~/blender/scripts/pbymodules
+
+    if [ -L ~/.blender/scripts/bpydata ]; then
+	rm ~/.blender/scripts/bpydata
+    fi
+
+    if [ -d ~/.blender/scripts/bpydata ]; then
+	mkdir -p ~/blender/scripts/bpydata
+	mkdir -p ~/blender/scripts/bpydata/config
+	cp -R /usr/share/blender/scripts/bpydata/* ~/.blender/scripts/bpydata/
+    fi
+
+    ln -sf /usr/share/blender/scripts/bpymodules ~/.blender/scripts/pbymodules
     ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
 fi
 
@@ -26,7 +36,7 @@
 # Fully update the plugins every time blender is launched.
 #
 
-rm -r ~/.blender/scripts/*.p*
+# rm -r ~/.blender/scripts/*.p*
 
 for s in /usr/share/blender/scripts/*.p* ; do
     s=`basename $s`


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-10/blender.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- blender.spec	3 Nov 2008 16:42:56 -0000	1.91
+++ blender.spec	22 Mar 2009 20:42:05 -0000	1.92
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -187,6 +187,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Jan 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-5
+- Fix some issue in blender-wrapper
+
 * Mon Nov  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-4
 - Fix security issue (#469655, CVE-2008-4863)