rpms/ogre/devel ogre-1.6.4-system-tinyxml.patch, NONE, 1.1 ogre-make-clean.sh, 1.1, 1.2 ogre.spec, 1.52, 1.53 ogre-1.4.7-system-tinyxml.patch, 1.2, NONE

Alexey Torkhov atorkhov at fedoraproject.org
Mon Sep 28 09:52:24 UTC 2009 

Author: atorkhov

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

Modified Files:
	ogre-make-clean.sh ogre.spec 
Added Files:
	ogre-1.6.4-system-tinyxml.patch 
Removed Files:
	ogre-1.4.7-system-tinyxml.patch 
Log Message:
* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.4-1
- New upstream release 1.6.4


ogre-1.6.4-system-tinyxml.patch:
 include/Makefile.am |    4 --
 include/Makefile.in |    4 --
 src/Makefile.am     |    8 +----
 src/Makefile.in     |   74 ++--------------------------------------------------
 4 files changed, 7 insertions(+), 83 deletions(-)

--- NEW FILE ogre-1.6.4-system-tinyxml.patch ---
diff -urp ogre.old/Tools/XMLConverter/include/Makefile.am ogre/Tools/XMLConverter/include/Makefile.am
--- ogre.old/Tools/XMLConverter/include/Makefile.am	2008-06-12 18:10:57.000000000 +0400
+++ ogre/Tools/XMLConverter/include/Makefile.am	2009-09-28 12:04:10.000000000 +0400
@@ -1,5 +1,3 @@
 noinst_HEADERS = OgreXMLMeshSerializer.h \
                  OgreXMLPrerequisites.h \
-                 OgreXMLSkeletonSerializer.h \
-                 tinystr.h \
-                 tinyxml.h
+                 OgreXMLSkeletonSerializer.h
diff -urp ogre.old/Tools/XMLConverter/include/Makefile.in ogre/Tools/XMLConverter/include/Makefile.in
--- ogre.old/Tools/XMLConverter/include/Makefile.in	2009-09-28 01:01:55.000000000 +0400
+++ ogre/Tools/XMLConverter/include/Makefile.in	2009-09-28 12:05:10.000000000 +0400
@@ -207,9 +207,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_HEADERS = OgreXMLMeshSerializer.h \
                  OgreXMLPrerequisites.h \
-                 OgreXMLSkeletonSerializer.h \
-                 tinystr.h \
-                 tinyxml.h
+                 OgreXMLSkeletonSerializer.h
 
 all: all-am
 
Только в ogre/Tools/XMLConverter/include: Makefile.in.orig
diff -urp ogre.old/Tools/XMLConverter/src/Makefile.am ogre/Tools/XMLConverter/src/Makefile.am
--- ogre.old/Tools/XMLConverter/src/Makefile.am	2008-08-08 12:58:28.000000000 +0400
+++ ogre/Tools/XMLConverter/src/Makefile.am	2009-09-28 12:04:10.000000000 +0400
@@ -3,10 +3,6 @@ bin_PROGRAMS=OgreXMLConverter
 OgreXMLConverter_CXXFLAGS=-DTIXML_USE_STL
 OgreXMLConverter_SOURCES= OgreXMLMeshSerializer.cpp \
                       OgreXMLSkeletonSerializer.cpp \
-                      main.cpp \
-                      tinystr.cpp \
-                      tinyxml.cpp \
-                      tinyxmlerror.cpp \
-                      tinyxmlparser.cpp
+                      main.cpp
 OgreXMLConverter_LDFLAGS= -L$(top_builddir)/OgreMain/src
-OgreXMLConverter_LDADD= -lOgreMain
+OgreXMLConverter_LDADD= -lOgreMain -ltinyxml
diff -urp ogre.old/Tools/XMLConverter/src/Makefile.in ogre/Tools/XMLConverter/src/Makefile.in
--- ogre.old/Tools/XMLConverter/src/Makefile.in	2009-09-28 01:01:55.000000000 +0400
+++ ogre/Tools/XMLConverter/src/Makefile.in	2009-09-28 12:05:10.000000000 +0400
@@ -50,11 +50,7 @@ PROGRAMS = $(bin_PROGRAMS)
 am_OgreXMLConverter_OBJECTS =  \
 	OgreXMLConverter-OgreXMLMeshSerializer.$(OBJEXT) \
 	OgreXMLConverter-OgreXMLSkeletonSerializer.$(OBJEXT) \
-	OgreXMLConverter-main.$(OBJEXT) \
-	OgreXMLConverter-tinystr.$(OBJEXT) \
-	OgreXMLConverter-tinyxml.$(OBJEXT) \
-	OgreXMLConverter-tinyxmlerror.$(OBJEXT) \
-	OgreXMLConverter-tinyxmlparser.$(OBJEXT)
+	OgreXMLConverter-main.$(OBJEXT)
 OgreXMLConverter_OBJECTS = $(am_OgreXMLConverter_OBJECTS)
 OgreXMLConverter_DEPENDENCIES =
 OgreXMLConverter_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -237,14 +233,10 @@ INCLUDES = $(STLPORT_CFLAGS) -I$(top_src
 OgreXMLConverter_CXXFLAGS = -DTIXML_USE_STL
 OgreXMLConverter_SOURCES = OgreXMLMeshSerializer.cpp \
                       OgreXMLSkeletonSerializer.cpp \
-                      main.cpp \
-                      tinystr.cpp \
-                      tinyxml.cpp \
-                      tinyxmlerror.cpp \
-                      tinyxmlparser.cpp
+                      main.cpp
 
 OgreXMLConverter_LDFLAGS = -L$(top_builddir)/OgreMain/src
-OgreXMLConverter_LDADD = -lOgreMain
+OgreXMLConverter_LDADD = -lOgreMain -ltinyxml
 all: all-am
 
 .SUFFIXES:
@@ -319,10 +311,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-OgreXMLMeshSerializer.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-OgreXMLSkeletonSerializer.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-tinystr.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-tinyxml.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-tinyxmlerror.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-tinyxmlparser.Po at am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -387,62 +375,6 @@ OgreXMLConverter-main.obj: main.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
 
-OgreXMLConverter-tinystr.o: tinystr.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinystr.o -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinystr.Tpo -c -o OgreXMLConverter-tinystr.o `test -f 'tinystr.cpp' || echo '$(srcdir)/'`tinystr.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinystr.Tpo $(DEPDIR)/OgreXMLConverter-tinystr.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinystr.cpp' object='OgreXMLConverter-tinystr.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinystr.o `test -f 'tinystr.cpp' || echo '$(srcdir)/'`tinystr.cpp
-
-OgreXMLConverter-tinystr.obj: tinystr.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinystr.obj -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinystr.Tpo -c -o OgreXMLConverter-tinystr.obj `if test -f 'tinystr.cpp'; then $(CYGPATH_W) 'tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/tinystr.cpp'; fi`
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinystr.Tpo $(DEPDIR)/OgreXMLConverter-tinystr.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinystr.cpp' object='OgreXMLConverter-tinystr.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinystr.obj `if test -f 'tinystr.cpp'; then $(CYGPATH_W) 'tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/tinystr.cpp'; fi`
-
-OgreXMLConverter-tinyxml.o: tinyxml.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxml.o -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxml.Tpo -c -o OgreXMLConverter-tinyxml.o `test -f 'tinyxml.cpp' || echo '$(srcdir)/'`tinyxml.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxml.Tpo $(DEPDIR)/OgreXMLConverter-tinyxml.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxml.cpp' object='OgreXMLConverter-tinyxml.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxml.o `test -f 'tinyxml.cpp' || echo '$(srcdir)/'`tinyxml.cpp
-
-OgreXMLConverter-tinyxml.obj: tinyxml.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxml.obj -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxml.Tpo -c -o OgreXMLConverter-tinyxml.obj `if test -f 'tinyxml.cpp'; then $(CYGPATH_W) 'tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxml.cpp'; fi`
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxml.Tpo $(DEPDIR)/OgreXMLConverter-tinyxml.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxml.cpp' object='OgreXMLConverter-tinyxml.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxml.obj `if test -f 'tinyxml.cpp'; then $(CYGPATH_W) 'tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxml.cpp'; fi`
-
-OgreXMLConverter-tinyxmlerror.o: tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxmlerror.o -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Tpo -c -o OgreXMLConverter-tinyxmlerror.o `test -f 'tinyxmlerror.cpp' || echo '$(srcdir)/'`tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Tpo $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxmlerror.cpp' object='OgreXMLConverter-tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxmlerror.o `test -f 'tinyxmlerror.cpp' || echo '$(srcdir)/'`tinyxmlerror.cpp
-
-OgreXMLConverter-tinyxmlerror.obj: tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxmlerror.obj -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Tpo -c -o OgreXMLConverter-tinyxmlerror.obj `if test -f 'tinyxmlerror.cpp'; then $(CYGPATH_W) 'tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxmlerror.cpp'; fi`
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Tpo $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxmlerror.cpp' object='OgreXMLConverter-tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxmlerror.obj `if test -f 'tinyxmlerror.cpp'; then $(CYGPATH_W) 'tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxmlerror.cpp'; fi`
-
-OgreXMLConverter-tinyxmlparser.o: tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxmlparser.o -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Tpo -c -o OgreXMLConverter-tinyxmlparser.o `test -f 'tinyxmlparser.cpp' || echo '$(srcdir)/'`tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Tpo $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxmlparser.cpp' object='OgreXMLConverter-tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxmlparser.o `test -f 'tinyxmlparser.cpp' || echo '$(srcdir)/'`tinyxmlparser.cpp
-
-OgreXMLConverter-tinyxmlparser.obj: tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxmlparser.obj -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Tpo -c -o OgreXMLConverter-tinyxmlparser.obj `if test -f 'tinyxmlparser.cpp'; then $(CYGPATH_W) 'tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxmlparser.cpp'; fi`
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Tpo $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxmlparser.cpp' object='OgreXMLConverter-tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxmlparser.obj `if test -f 'tinyxmlparser.cpp'; then $(CYGPATH_W) 'tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxmlparser.cpp'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 


Index: ogre-make-clean.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre-make-clean.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ogre-make-clean.sh	16 Apr 2009 13:13:18 -0000	1.1
+++ ogre-make-clean.sh	28 Sep 2009 09:52:24 -0000	1.2
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-version=1.6.2
+version=1.6.4
 
 [ ! -e ogre ]
 


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ogre.spec	25 Jul 2009 20:37:48 -0000	1.52
+++ ogre.spec	28 Sep 2009 09:52:24 -0000	1.53
@@ -1,6 +1,6 @@
 Name:           ogre
-Version:        1.6.2
-Release:        2%{?dist}
+Version:        1.6.4
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 # LGPLv2+ with exceptions - main library
 # CC-BY-SA - devel docs
@@ -10,7 +10,7 @@ License:        LGPLv2+ with exceptions 
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
 # This is modified http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
-# with non-free files striped:
+# with non-free files striped (see ogre-make-clean.sh):
 # - Non-free licensed headers under RenderSystems/GL/include/GL removed
 # - GLEW sources (RenderSystems/GL/include/GL, RenderSystems/GL/src/GL/glew.cpp) updated to 1.5.1 - upstream doesn't want to update http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
 # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed
@@ -21,7 +21,7 @@ Patch0:         ogre-1.2.1-rpath.patch
 #Patch1:         ogre-1.6.0-system-glew.patch
 # Upstream patch to GLEW applied to new version
 Patch1:         ogre-1.6.0rc1-glew.patch
-Patch2:         ogre-1.4.7-system-tinyxml.patch
+Patch2:         ogre-1.6.4-system-tinyxml.patch
 Patch3:         ogre-1.6.1-fix-ppc-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel
@@ -29,6 +29,8 @@ BuildRequires:  libXaw-devel libXrandr-d
 BuildRequires:  ois-devel freeimage-devel openexr-devel
 #BuildRequires:  glew-devel
 BuildRequires:  tinyxml-devel
+# For drawing config dialog
+Requires:       xorg-x11-fonts-misc
 
 %description
 OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
@@ -215,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.4-1
+- New upstream release 1.6.4
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- ogre-1.4.7-system-tinyxml.patch DELETED ---

More information about the fedora-extras-commits mailing list