rpms/blender/devel blender-wrapper,1.2,1.3 blender.spec,1.83,1.84

[Jochen Schmitt]

Author: s4504kr

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

Modified Files:
	blender-wrapper blender.spec 
Log Message:
Remove duplicate python scripts


Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-wrapper,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blender-wrapper	26 Jul 2006 20:11:10 -0000	1.2
+++ blender-wrapper	7 Oct 2008 16:29:04 -0000	1.3
@@ -28,7 +28,6 @@
 
 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
 
@@ -36,6 +35,8 @@
 # Fully update the plugins every time blender is launched.
 #
 
+rm -r ~/.blender/scripts/*
+
 for s in /usr/share/blender/scripts/* ; do
     s=`basename $s`
     if [ ! -e ~/.blender/scripts/$s ] ; then


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- blender.spec	7 Sep 2008 20:28:45 -0000	1.83
+++ blender.spec	7 Oct 2008 16:29:04 -0000	1.84
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.47
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -116,7 +116,6 @@
 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
 
@@ -125,14 +124,15 @@
 
 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
+install -p -m 644 release/scripts/*.p* ${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 +179,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* 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