From e742c8641a8d7320311adeee34de22a093ffc346 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Oct 07 2008 19:34:22 +0000
Subject: Reorganisation directory structure to fix sysinfo.py issue


---

diff --git a/blender-wrapper b/blender-wrapper
index 4b2f1a3..b7dc66c 100644
--- a/blender-wrapper
+++ b/blender-wrapper
@@ -11,32 +11,24 @@ if [ ! -d ~/.blender ]; then
     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
-    ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
-    cp -a /usr/share/blender/VERSION ~/.blender
-fi
-
 #
 # Fully update the plugins every time blender is launched.
 #
 
-for s in /usr/share/blender/scripts/* ; do
+rm -r ~/.blender/scripts/*.p*
+
+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/
diff --git a/blender.spec b/blender.spec
index f1dc6d0..9a658bd 100644
--- a/blender.spec
+++ b/blender.spec
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.47
-Release: 	1%{?dist}
+Release: 	5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -115,9 +115,6 @@ install -D -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}/%{_bindir}/blender
 
 mkdir -p ${RPM_BUILD_ROOT}/%{blenderlib}
 
-cp -a release/scripts/bpydata ${RPM_BUILD_ROOT}/%{blenderlib}
-cp -a release/scripts ${RPM_BUILD_ROOT}/%{blenderlib}
-
 pushd bin/.blender/locale
 
 rm -rf $(find -name '.svn' -print)
@@ -125,14 +122,16 @@ popd
 
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
 
-install -p -D -m 644 release/scripts/*.py ${RPM_BUILD_ROOT}/%{blenderlib}
+install -d ${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}
 install -m 644 bin/.blender/.bfont.ttf ${RPM_BUILD_ROOT}/%{blenderlib}
 
-install -p -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{blenderlib}/import-3ds-0.7.py
-install -p -D -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{blenderlib}/export-3ds-0.71.py
+install -p -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{blenderlib}/scripts/import-3ds-0.7.py
+install -p -D -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{blenderlib}/scripts/export-3ds-0.71.py
 
 install -p -D -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/blender.png
 
@@ -179,6 +178,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_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)
+
+* Sun Sep  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-3
+- Fix prerelease SPEC file
+
 * Thu Aug 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-1
 - New upstream release