rpms/ogre/devel ogre-samples.sh,1.3,1.4 ogre.spec,1.36,1.37

[Alexey Torkhov]

Author: atorkhov

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

Modified Files:
	ogre-samples.sh ogre.spec 
Log Message:
* Thu Nov 06 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-1
- New upstream release 1.6.0
- Updated samples running script
- Removed non-free quake map from samples media
- Added docs license in License tag



Index: ogre-samples.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre-samples.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ogre-samples.sh	12 Nov 2007 09:38:42 -0000	1.3
+++ ogre-samples.sh	7 Nov 2008 10:28:39 -0000	1.4
@@ -1,4 +1,35 @@
-#!/bin/bash
+#!/bin/sh
+
+selectPCZ()
+{
+  sed -i 's|^\(Plugin=Plugin_OctreeSceneManager.so\)|#\1|' plugins.cfg
+  sed -i 's|^#\(Plugin=libPlugin_PCZSceneManager.so\)|\1|' plugins.cfg
+  sed -i 's|^#\(Plugin=Plugin_OctreeZone.so\)|\1|' plugins.cfg
+}
+
+unselectPCZ()
+{
+  sed -i 's|^#\(Plugin=Plugin_OctreeSceneManager.so\)|\1|' plugins.cfg
+  sed -i 's|^\(Plugin=libPlugin_PCZSceneManager.so\)|#\1|' plugins.cfg
+  sed -i 's|^\(Plugin=Plugin_OctreeZone.so\)|#\1|' plugins.cfg
+}
+
+runSample()
+{
+  sample=$1
+  if [ "$sample" = "PCZTestApp" ]; then
+    selectPCZ
+  else
+    unselectPCZ
+  fi
+
+  echo "Running $sample..."
+  $LIBDIR/OGRE/Samples/$sample
+
+  if [ "$sample" = "PCZTestApp" ]; then
+    unselectPCZ
+  fi
+}
 
 set -e
 
@@ -12,32 +43,30 @@
 mkdir -p $HOME/.ogre-samples
 cd $HOME/.ogre-samples
 
-cp -f $LIBDIR/OGRE/Samples/resources.cfg .
-cp -f $LIBDIR/OGRE/Samples/media.cfg .
-
-echo "# Defines plugins to load" > plugins.cfg
-echo >> plugins.cfg
-echo "# Define plugin folder" >> plugins.cfg
-echo "PluginFolder=$LIBDIR/OGRE" >> plugins.cfg
-echo >> plugins.cfg
-echo "# Define D3D rendering implementation plugin" >> plugins.cfg
-for i in `(cd $LIBDIR/OGRE; ls *.so)`; do
-  if [ $i != libOgrePlatform.so ]; then
-    echo "Plugin=$i" >> plugins.cfg
-  fi
+for i in plugins.cfg media.cfg quake3settings.cfg resources.cfg; do
+  cp -f $LIBDIR/OGRE/Samples/$i .
 done
 
 set +e
 
-if [ $# -ge 1 ]; then
+if [ "$1" = "-a" ]; then
+  for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111 | sort)`; do
+    runSample `echo $i | sed 's|./||'`
+  done
+elif [ $# -ge 1 ]; then
   while [ $# -ge 1 ]; do
-    $LIBDIR/OGRE/Samples/$1
+    runSample $1
     shift
   done
 else
-  for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111)`; do
-    if [ $i != ./BSP ]; then
-      $LIBDIR/OGRE/Samples/$i
-    fi
+  echo "Usage: " `basename $0` " (samples | -a)"
+  echo
+  echo "samples - Runs specified samples from list"
+  echo "-a      - Runs all samples"
+  echo
+  echo -n "Available samples:"
+  for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111 | sort)`; do
+    echo -n " $i" | sed 's|./||'
   done
+  echo
 fi


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ogre.spec	28 Sep 2008 07:35:11 -0000	1.36
+++ ogre.spec	7 Nov 2008 10:28:39 -0000	1.37
@@ -1,14 +1,16 @@
 Name:           ogre
 Version:        1.6.0
-Release:        0.1.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
-License:        LGPLv2+
+# CC-BY-SA is for devel docs
+License:        LGPLv2+ and CC-BY-SA
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
 # This is http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
 # With the non free licensed headers under RenderSystems/GL/include/GL removed
 # And GLEW sources updated to 1.5.0 - upstream notified http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
-Source0:        ogre-1.6.0rc1-clean.tar.bz2
+# And non-free chiropteraDM.pk3 under Samples/Media/packs removed
+Source0:        %{name}-%{version}-clean.tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
 #Patch1:         ogre-1.6.0-system-glew.patch
@@ -122,16 +124,25 @@
   OgreMain/include/OgrePlatformInformation.h \
   $RPM_BUILD_ROOT%{_includedir}/OGRE
 
+# Create config for ldconfig
+mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo "%{_libdir}/OGRE" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+
 # Install the samples
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
 # The Sample binaries get installed into the buildroot in a subdir of
 # the cwd??
 mv $RPM_BUILD_ROOT`pwd`/Samples/Common/bin/* \
   $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
-for cfg in media.cfg quake3settings.cfg resources.cfg; do
+for cfg in plugins.cfg media.cfg quake3settings.cfg resources.cfg; do
   install -p -m 644 Samples/Common/bin/$cfg \
     $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
 done
+sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
+    $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples/plugins.cfg
+# Change location of pak + switch from non-free chiropteraDM map
+sed -i 's|^Pak0Location: ../../Media/.*$|Pak0Location: %{_datadir}/OGRE/Samples/Media/packs/ogretestmap.zip|' \
+    $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples/quake3settings.cfg
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/Ogre-Samples
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
@@ -149,7 +160,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING 
+%doc AUTHORS BUGS COPYING
 %doc Docs/ChangeLog.html Docs/ReadMe.html Docs/style.css Docs/ogre-logo.gif
 %{_bindir}/Ogre*
 %{_bindir}/rcapsdump
@@ -159,6 +170,7 @@
 %exclude %{_bindir}/Ogre-Samples
 %exclude %{_libdir}/OGRE/Samples
 %exclude %{_datadir}/OGRE/Samples
+/etc/ld.so.conf.d/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -179,6 +191,12 @@
 
 
 %changelog
+* Thu Nov 06 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-1
+- New upstream release 1.6.0
+- Updated samples running script
+- Removed non-free quake map from samples media
+- Added docs license in License tag
+
 * Sat Sep 21 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1.rc1
 - New upstream release 1.6.0rc1
 - Disabling broken OpenEXR plugin, it is not updated for long time and doesn't