rpms/ogre/devel ogre-renderer-libs.patch, NONE, 1.1 ogre.spec, 1.56, 1.57

[Bruno Wolff III]

Author: bruno

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

Modified Files:
	ogre.spec 
Added Files:
	ogre-renderer-libs.patch 
Log Message:
Fix some unresolved references in the Ogre CEGUI shared library.



ogre-renderer-libs.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ogre-renderer-libs.patch ---
--- ogre/Samples/Common/CEGUIRenderer/src/Makefile.in.orig	2009-09-27 16:01:34.000000000 -0500
+++ ogre/Samples/Common/CEGUIRenderer/src/Makefile.in	2009-11-23 16:14:22.000000000 -0600
@@ -237,8 +237,8 @@
 INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/Samples/Common/CEGUIRenderer/include -I$(top_srcdir)/OgreMain/include @CEGUI_CFLAGS@ $(CFLAGS_VISIBILITY)
 lib_LTLIBRARIES = libCEGUIOgreRenderer.la
 libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp OgreCEGUITexture.cpp OgreCEGUIResourceProvider.cpp
-libCEGUIOgreRenderer_la_LIBADD = $(STLPORT_LIBS)
-libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@
+libCEGUIOgreRenderer_la_LIBADD = $(STLPORT_LIBS) @CEGUI_LIBS@ -lOgreMain
+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@ -L$(top_builddir)/OgreMain/src
 all: all-am
 
 .SUFFIXES:


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- ogre.spec	22 Nov 2009 06:29:10 -0000	1.56
+++ ogre.spec	24 Nov 2009 00:42:28 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.6.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 # LGPLv2+ with exceptions - main library
 # CC-BY-SA - devel docs
@@ -23,6 +23,7 @@ Patch0:         ogre-1.2.1-rpath.patch
 Patch1:         ogre-1.6.0rc1-glew.patch
 Patch2:         ogre-1.6.4-system-tinyxml.patch
 Patch3:         ogre-1.6.1-fix-ppc-build.patch
+Patch4:         ogre-renderer-libs.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 -z .ppc
+%patch4 -p1
 # 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
@@ -217,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 23 2009 Bruno Wolff III <bruno at wolff.to> - 1.6.4-4
+- Allow CEGIUOgreRenderer to find needed libraries
+
 * Sat Nov 21 2009 Bruno Wolff III <bruno at wolff.to> - 1.6.4-3
 - Spec file cleanups