rpms/blender/devel blender-wrapper,1.3,1.4 blender.spec,1.84,1.85

[Jochen Schmitt]

Author: s4504kr

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

Modified Files:
	blender-wrapper blender.spec 
Log Message:
Reorganisation directory structure to fix sysinfo.py issue


Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-wrapper,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blender-wrapper	7 Oct 2008 16:29:04 -0000	1.3
+++ blender-wrapper	7 Oct 2008 19:16:44 -0000	1.4
@@ -11,33 +11,24 @@
     ln -sf /usr/share/locale ~/.blender/locale
     ln -sf /usr/share/blender/.Blanguages ~/.blender
     ln -sf /usr/share/blender/.bfont.ttf ~/.blender
-    cp -a /usr/share/blender/bpydata ~/.blender
-    cp -a /usr/share/blender/VERSION ~/.blender
+    ln -sf /usr/share/blender/VERSION ~/.blender/VERSION
 
     install -d ~/.blender/plugins/sequence
     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
     ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
 fi
 
-# 
-# In case the user's ~/.blender came from older versions, some files 
-# should be reinstalled.
-#
-
-if [ $(cat ~/.blender/VERSION) != $(cat /usr/share/blender/VERSION) ]; then
-    cp -a /usr/share/blender/bpydata ~/.blender
-    cp -a /usr/share/blender/VERSION ~/.blender
-fi
-
 #
 # Fully update the plugins every time blender is launched.
 #
 
-rm -r ~/.blender/scripts/*
+rm -r ~/.blender/scripts/*.p*
 
-for s in /usr/share/blender/scripts/* ; do
+for s in /usr/share/blender/scripts/*.p* ; do
     s=`basename $s`
     if [ ! -e ~/.blender/scripts/$s ] ; then
          ln -sf /usr/share/blender/scripts/$s ~/.blender/scripts/


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- blender.spec	7 Oct 2008 16:29:04 -0000	1.84
+++ blender.spec	7 Oct 2008 19:16:44 -0000	1.85
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.47
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -115,8 +115,6 @@
 
 mkdir -p ${RPM_BUILD_ROOT}/%{blenderlib}
 
-cp -a release/scripts/bpydata ${RPM_BUILD_ROOT}/%{blenderlib}
-
 pushd bin/.blender/locale
 
 rm -rf $(find -name '.svn' -print)
@@ -125,7 +123,8 @@
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
 
 install -d ${RPM_BUILD_ROOT}/%{blenderlib}/scripts
-install -p -m 644 release/scripts/*.p* ${RPM_BUILD_ROOT}/%{blenderlib}/scripts/
+
+cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}/%{blenderlib}/scripts
 
 install -m 644 release/VERSION ${RPM_BUILD_ROOT}/%{blenderlib}
 install -m 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}/%{blenderlib}
@@ -179,6 +178,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Tue Oct  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-5
+- Reorganisation directory structure to fix sysinfo.py issue
+
 * Tue Oct  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-4
 - Avoid duplicate python script (#465810)