rpms/ember/devel ember-0.5.4-caelum-temp-fix.patch, NONE, 1.1 ember.spec, 1.3, 1.4

[Alexey Torkhov]

Author: atorkhov

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

Modified Files:
	ember.spec 
Added Files:
	ember-0.5.4-caelum-temp-fix.patch 
Log Message:
* Mon Nov 04 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-4
- Rebuild for new OGRE
- Including lost entityrecipes and sounddefinitions to media
- Running unit checks during build


ember-0.5.4-caelum-temp-fix.patch:

--- NEW FILE ember-0.5.4-caelum-temp-fix.patch ---
commit 532e2ad4ca25b832b227aa1ec9f7070684b73b3d
Author: Erik Hjortsberg <erik.hjortsberg at iteam.se>
Date:   Wed Oct 22 13:36:12 2008 +0200

    Temporarily removed these lines to handle a bug in Ogre.

diff --git a/src/components/ogre/environment/caelum/src/LayeredClouds.cpp b/src/components/ogre/environment/caelum/src/LayeredClouds.cpp
index 726ea7e..ce109da 100644
--- a/src/components/ogre/environment/caelum/src/LayeredClouds.cpp
+++ b/src/components/ogre/environment/caelum/src/LayeredClouds.cpp
@@ -177,8 +177,8 @@ namespace caelum
 		};
 
 		Ogre::Pass* pass = mMaterial->getBestTechnique()->getPass(0);
-		pass->getTextureUnitState(0)->setAnimatedTextureName(animTextures1, 4, cloudBlendTime * 4);
-		pass->getTextureUnitState(1)->setAnimatedTextureName(animTextures2, 4, cloudBlendTime * 4);
+/*		pass->getTextureUnitState(0)->setAnimatedTextureName(animTextures1, 4, cloudBlendTime * 4);
+		pass->getTextureUnitState(1)->setAnimatedTextureName(animTextures2, 4, cloudBlendTime * 4);*/
 		setCloudMassBlend(0);
 		mCloudBlendTime = cloudBlendTime;
 	}


Index: ember.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/ember.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ember.spec	2 Oct 2008 19:01:39 -0000	1.3
+++ ember.spec	7 Nov 2008 21:08:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ember
 Version:        0.5.4
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Ember - a client for Worldforge
 
 Group:          Amusements/Games
@@ -56,7 +56,11 @@
     $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
 # Remove media that are duplicated with ember-media package
-rm -rf $RPM_BUILD_ROOT%{_datadir}/ember/media/user # modeldefinitions
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ember/media/user/modeldefinitions
+
+
+%check
+make check
 
 
 %clean
@@ -80,6 +84,9 @@
 # datadir/%{name}/media/shared/gui/cegui is owned by ember-media
 %{_datadir}/%{name}/media/shared/gui/cegui/datafiles
 %{_datadir}/%{name}/media/shared/scripting
+# datadir/%{name}/media/user is owned by ember-media
+%{_datadir}/%{name}/media/user/entityrecipes
+%{_datadir}/%{name}/media/user/sounddefinitions
 
 # Not using noreplace: having old config file can make things not working as was intended. User can override settings with config in homedir.
 %dir %{_sysconfdir}/%{name}
@@ -88,6 +95,14 @@
 
 
 %changelog
+* Mon Nov 04 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-4
+- Rebuild for new OGRE
+- Including lost entityrecipes and sounddefinitions to media
+- Running unit checks during build
+
+* Thu Oct 23 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-3
+- Workaround of crash in Caelum with new OGRE
+
 * Thu Oct 02 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-2
 - Update for new OGRE