rpms/ogre/devel ogre-samples.sh,1.2,1.3 ogre.spec,1.16,1.17
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Nov 12 09:39:15 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20629
Modified Files:
ogre-samples.sh ogre.spec
Log Message:
* Mon Nov 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.5-2
- Ogre-Samples now takes the name of which samples to run as arguments, if no
arguments are provided, it will run all of them like it used too (bz 377011)
- Don't install a useless / broken plugins.cfg in the Samples folder,
Ogre-Samples will generate a correct one when run (bz 377011)
Index: ogre-samples.sh
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-samples.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ogre-samples.sh 1 Jul 2007 20:26:43 -0000 1.2
+++ ogre-samples.sh 12 Nov 2007 09:38:42 -0000 1.3
@@ -29,8 +29,15 @@
set +e
-for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111)`; do
- if [ $i != ./BSP ]; then
- $LIBDIR/OGRE/Samples/$i
- fi
-done
+if [ $# -ge 1 ]; then
+ while [ $# -ge 1 ]; do
+ $LIBDIR/OGRE/Samples/$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
+ done
+fi
Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ogre.spec 8 Oct 2007 18:23:35 -0000 1.16
+++ ogre.spec 12 Nov 2007 09:38:42 -0000 1.17
@@ -1,6 +1,6 @@
Name: ogre
Version: 1.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Object-Oriented Graphics Rendering Engine
License: LGPLv2+
Group: System Environment/Libraries
@@ -116,9 +116,9 @@
# the cwd??
mv $RPM_BUILD_ROOT`pwd`/Samples/Common/bin/* \
$RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
-for cfg in `find Samples/Common/bin -name \*.cfg -print -maxdepth 1`
-do
- install -p -m 644 $cfg $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
+for cfg in media.cfg quake3settings.cfg resources.cfg; do
+ install -p -m 644 Samples/Common/bin/$cfg \
+ $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
done
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/Ogre-Samples
@@ -166,6 +166,12 @@
%changelog
+* Mon Nov 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.5-2
+- Ogre-Samples now takes the name of which samples to run as arguments, if no
+ arguments are provided, it will run all of them like it used too (bz 377011)
+- Don't install a useless / broken plugins.cfg in the Samples folder,
+ Ogre-Samples will generate a correct one when run (bz 377011)
+
* Mon Oct 8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.5-1
- New upstream release 1.4.5
More information about the scm-commits
mailing list