rpms/blender/devel blender-wrapper, 1.6, 1.7 blender.spec, 1.101, 1.102

[Jochen Schmitt]

Author: s4504kr

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

Modified Files:
	blender-wrapper blender.spec 
Log Message:
Fix broken wrapper script


Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-wrapper,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blender-wrapper	26 Jan 2009 15:57:28 -0000	1.6
+++ blender-wrapper	17 Feb 2009 17:20:15 -0000	1.7
@@ -46,17 +46,17 @@
 done
 
 if [ -d /usr/lib64/blender/scripts ] ; then
-    for s in /usr/lib64/blender/* ; do
+    for s in /usr/lib64/blender/scripts/* ; do
 	s=`basename $s`
 	if [ ! -e ~/.blender/scripts/$s -a -x /usr/lib64/blender/scripts/$s ] ; then
-	    ln -sf /usr/lib64/blender/$s ~/.blender/scripts/
+	    ln -sf /usr/lib64/blender/scripts/$s ~/.blender/scripts/
 	fi
     done
 elif [ -d /usr/lib/blender/scripts ] ; then
-    for s in /usr/lib/blender/* ; do
+    for s in /usr/lib/blender/scripts/* ; do
 	s=`basename $s`
 	if [ ! -e ~/.blender/scripts/$s -a -x /usr/lib/blender/scripts/$s ] ; then
-	    ln -sf /usr/lib/blender/$s ~/.blender/scripts/
+	    ln -sf /usr/lib/blender/scripts/$s ~/.blender/scripts/
 	fi
     done
 fi


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- blender.spec	26 Jan 2009 15:57:28 -0000	1.101
+++ blender.spec	17 Feb 2009 17:20:15 -0000	1.102
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	13%{?dist}
+Release: 	14%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -67,7 +67,14 @@
 Requires(postun): shared-mime-info
 
 Requires:	  blender-fonts = %{version}-%{release}
+
+%if 0%{?fedora} > 10
 Requires:	  dejavu-sans-fonts
+%endif
+
+%if 0%{?fedora} <= 10
+Requires:	  dejavu-fonts
+%endif
 
 Provides:	  blender-fonts = %{version}-%{release}
 Obsoletes:	  blender-fonts <= 2.48a-9
@@ -195,6 +202,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Tue Feb 17 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-14
+- Fix broken wrapper script
+
 * Wed Jan 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-13
 - Do some fixes on blender-wrapeer