rpms/ogre/F-11 ogre-include-8958.patch, NONE, 1.1 ogre.spec, 1.51, 1.52

[Bruno Wolff III]

Author: bruno

Update of /cvs/pkgs/rpms/ogre/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5499

Modified Files:
	ogre.spec 
Added Files:
	ogre-include-8958.patch 
Log Message:
Backport include file fix and one spec file clean up.



ogre-include-8958.patch:
 GLX/OgreConfigDialogImp.h   |    6 +++---
 GLX/OgreErrorDialogImp.h    |    2 +-
 GLX/OgreTimerImp.h          |    2 +-
 OSX/OgreConfigDialogImp.h   |    6 +++---
 OSX/OgreErrorDialogImp.h    |    2 +-
 OSX/OgreTimerImp.h          |    2 +-
 WIN32/OgreConfigDialogImp.h |    2 +-
 gtk/OgreConfigDialogImp.h   |    6 +++---
 gtk/OgreErrorDialogImp.h    |    2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE ogre-include-8958.patch ---
Index: OgreMain/include/WIN32/OgreConfigDialogImp.h
===================================================================
--- OgreMain/include/WIN32/OgreConfigDialogImp.h	(revision 8957)
+++ OgreMain/include/WIN32/OgreConfigDialogImp.h	(revision 8958)
@@ -29,7 +29,7 @@
 #ifndef __Win32ConfigDialog_H__
 #define __Win32ConfigDialog_H__
 
-#include "OgrePrerequisites.h"
+#include "../OgrePrerequisites.h"
 
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX // required to stop windows.h messing up std::min
Index: OgreMain/include/OSX/OgreErrorDialogImp.h
===================================================================
--- OgreMain/include/OSX/OgreErrorDialogImp.h	(revision 8957)
+++ OgreMain/include/OSX/OgreErrorDialogImp.h	(revision 8958)
@@ -29,7 +29,7 @@
 #ifndef __OSXErrorDialog_H__
 #define __OSXErrorDialog_H__
 
-#include <Ogre/OgrePrerequisites.h>
+#include "../OgrePrerequisites.h"
 
 namespace Ogre
 {
Index: OgreMain/include/OSX/OgreTimerImp.h
===================================================================
--- OgreMain/include/OSX/OgreTimerImp.h	(revision 8957)
+++ OgreMain/include/OSX/OgreTimerImp.h	(revision 8958)
@@ -30,7 +30,7 @@
 #ifndef __OSXTimer_H__
 #define __OSXTimer_H__
 
-#include <Ogre/OgrePrerequisites.h>
+#include "../OgrePrerequisites.h"
 
 namespace Ogre
 {
Index: OgreMain/include/OSX/OgreConfigDialogImp.h
===================================================================
--- OgreMain/include/OSX/OgreConfigDialogImp.h	(revision 8957)
+++ OgreMain/include/OSX/OgreConfigDialogImp.h	(revision 8958)
@@ -1,9 +1,9 @@
 #ifndef __OSXConfigDialog_H__
 #define __OSXConfigDialog_H__
 
-#include <Ogre/OgrePrerequisites.h>
-#include <Ogre/OgreRoot.h>
-#include <Ogre/OgreRenderSystem.h>
+#include "../OgrePrerequisites.h"
+#include "../OgreRoot.h"
+#include "../OgreRenderSystem.h"
 
 namespace Ogre
 {
Index: OgreMain/include/GLX/OgreErrorDialogImp.h
===================================================================
--- OgreMain/include/GLX/OgreErrorDialogImp.h	(revision 8957)
+++ OgreMain/include/GLX/OgreErrorDialogImp.h	(revision 8958)
@@ -29,7 +29,7 @@
 #ifndef __OGRE_GLX_ERROR_DIALOG_H__
 #define __OGRE_GLX_ERROR_DIALOG_H__
 
-#include "OgrePrerequisites.h"
+#include "../OgrePrerequisites.h"
 
 namespace Ogre
 {
Index: OgreMain/include/GLX/OgreTimerImp.h
===================================================================
--- OgreMain/include/GLX/OgreTimerImp.h	(revision 8957)
+++ OgreMain/include/GLX/OgreTimerImp.h	(revision 8958)
@@ -30,7 +30,7 @@
 #ifndef __GLXTimer_H__
 #define __GLXTimer_H__
 
-#include "OgrePrerequisites.h"
+#include "../OgrePrerequisites.h"
 
 namespace Ogre
 {
Index: OgreMain/include/GLX/OgreConfigDialogImp.h
===================================================================
--- OgreMain/include/GLX/OgreConfigDialogImp.h	(revision 8957)
+++ OgreMain/include/GLX/OgreConfigDialogImp.h	(revision 8958)
@@ -30,9 +30,9 @@
 #ifndef __GLXCONFIGDIALOG_H__
 #define __GLXCONFIGDIALOG_H__
 
-#include "OgrePrerequisites.h"
-#include "OgreRoot.h"
-#include "OgreRenderSystem.h"
+#include "../OgrePrerequisites.h"
+#include "../OgreRoot.h"
+#include "../OgreRenderSystem.h"
 
 namespace Ogre
 {
Index: OgreMain/include/gtk/OgreErrorDialogImp.h
===================================================================
--- OgreMain/include/gtk/OgreErrorDialogImp.h	(revision 8957)
+++ OgreMain/include/gtk/OgreErrorDialogImp.h	(revision 8958)
@@ -29,7 +29,7 @@
 #ifndef __OGRE_GLX_ERROR_DIALOG_H__
 #define __OGRE_GLX_ERROR_DIALOG_H__
 
-#include "OgrePrerequisites.h"
+#include "../OgrePrerequisites.h"
 
 namespace Ogre
 {
Index: OgreMain/include/gtk/OgreConfigDialogImp.h
===================================================================
--- OgreMain/include/gtk/OgreConfigDialogImp.h	(revision 8957)
+++ OgreMain/include/gtk/OgreConfigDialogImp.h	(revision 8958)
@@ -30,9 +30,9 @@
 #ifndef __GLXCONFIGDIALOG_H__
 #define __GLXCONFIGDIALOG_H__
 
-#include "OgrePrerequisites.h"
-#include "OgreRoot.h"
-#include "OgreRenderSystem.h"
+#include "../OgrePrerequisites.h"
+#include "../OgreRoot.h"
+#include "../OgreRenderSystem.h"
 
 #include <gtk/gtk.h>
 


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/F-11/ogre.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ogre.spec	16 Apr 2009 11:50:36 -0000	1.51
+++ ogre.spec	28 Nov 2009 06:05:37 -0000	1.52
@@ -23,6 +23,7 @@ Patch0:         ogre-1.2.1-rpath.patch
 Patch1:         ogre-1.6.0rc1-glew.patch
 Patch2:         ogre-1.4.7-system-tinyxml.patch
 Patch3:         ogre-1.6.1-fix-ppc-build.patch
+Patch4:         ogre-include-8958.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
@@ -79,6 +80,7 @@ with the wrapper script called "Ogre-Sam
 %patch1 -p1 -z .glew
 %patch2 -p1 -z .sys-tinyxml
 %patch3 -p1
+%patch4
 # remove execute bits from src-files for -debuginfo package
 chmod -x `find RenderSystems/GL -type f` \
   `find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp
@@ -190,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_bindir}/Ogre-Samples
 %exclude %{_libdir}/OGRE/Samples
 %exclude %{_datadir}/OGRE/Samples
-/etc/ld.so.conf.d/*
+%configure(noreplace) /etc/ld.so.conf.d/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -212,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 28 2009 Bruno Wolff III <bruno at wolff.to> - 1.6.1-6
+- Backport fix to broken include files from commit 8859
+- Note ld config file is a config file
+
 * Fri Mar 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.1-5
 - Add licenses of samples to License tag