rpms/ogre/devel ogre-samples.sh,1.5,1.6 ogre.spec,1.48,1.49

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29282

Modified Files:
	ogre-samples.sh ogre.spec 
Log Message:
* Mon Mar 02 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.1-4
- Update Ogre-Samples to work properly without CgProgramManager plugin



Index: ogre-samples.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre-samples.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ogre-samples.sh	9 Nov 2008 12:35:25 -0000	1.5
+++ ogre-samples.sh	2 Mar 2009 08:45:45 -0000	1.6
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+checkCg()
+{
+  if [ ! -f $LIBDIR/OGRE/Plugin_CgProgramManager.so ]; then
+    sed -i 's|^\(Plugin=Plugin_CgProgramManager.so\)|#\1|' plugins.cfg
+  else
+    sed -i 's|^#\(Plugin=Plugin_CgProgramManager.so\)|\1|' plugins.cfg
+  fi
+}
+
 selectPCZ()
 {
   sed -i 's|^\(Plugin=Plugin_OctreeSceneManager.so\)|#\1|' plugins.cfg
@@ -47,11 +56,13 @@
   cp -f $LIBDIR/OGRE/Samples/$i .
 done
 
+checkCg
+
 set +e
 
 if [ "$1" = "-a" ]; then
   for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111 | sort)`; do
-    runSample `echo $i | sed 's|./||'`
+    runSample `echo $i | sed 's#./##'`
   done
 elif [ $# -ge 1 ]; then
   while [ $# -ge 1 ]; do
@@ -66,7 +77,7 @@
   echo
   echo -n "Available samples:"
   for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111 | sort)`; do
-    echo -n " $i" | sed 's|./||'
+    echo -n " $i" | sed 's#./##'
   done
   echo
 fi


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ogre.spec	27 Feb 2009 08:47:19 -0000	1.48
+++ ogre.spec	2 Mar 2009 08:45:45 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 # CC-BY-SA is for devel docs
 License:        LGPLv2+ and CC-BY-SA
@@ -20,7 +20,7 @@
 Patch2:         ogre-1.4.7-system-tinyxml.patch
 Patch3:         ogre-1.6.1-fix-ppc-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  cegui-devel zziplib-devel freetype-devel gtk2-devel
+BuildRequires:  cegui-devel zziplib-devel freetype-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
 BuildRequires:  ois-devel freeimage-devel
 #BuildRequires:  openexr-devel glew-devel
@@ -208,6 +208,9 @@
 
 
 %changelog
+* Mon Mar 02 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.1-4
+- Update Ogre-Samples to work properly without CgProgramManager plugin
+
 * Fri Feb 27 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.1-3
 - Fixing PPC build