rpms/ogre/devel ogre-1.4.7-system-tinyxml.patch, 1.1, 1.2 ogre.spec, 1.28, 1.29

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27278

Modified Files:
	ogre-1.4.7-system-tinyxml.patch ogre.spec 
Log Message:
* Thu May 22 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.8-2
- Rebuild for new cegui
- Use system tinyxml (bz 447698)


ogre-1.4.7-system-tinyxml.patch:

Index: ogre-1.4.7-system-tinyxml.patch
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-1.4.7-system-tinyxml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-1.4.7-system-tinyxml.patch	21 May 2008 21:28:35 -0000	1.1
+++ ogre-1.4.7-system-tinyxml.patch	22 May 2008 10:32:33 -0000	1.2
@@ -121,3 +121,27 @@
  mostlyclean-libtool:
  	-rm -f *.lo
  
+diff -up ogre/Tools/XMLConverter/include/Makefile.am~ ogre/Tools/XMLConverter/include/Makefile.am
+--- ogre/Tools/XMLConverter/include/Makefile.am~	2008-05-22 12:02:52.000000000 +0200
++++ ogre/Tools/XMLConverter/include/Makefile.am	2008-05-22 12:02:52.000000000 +0200
+@@ -1,5 +1,3 @@
+ noinst_HEADERS = OgreXMLMeshSerializer.h \
+                  OgreXMLPrerequisites.h \
+-                 OgreXMLSkeletonSerializer.h \
+-                 tinystr.h \
+-                 tinyxml.h
++                 OgreXMLSkeletonSerializer.h
+diff -up ogre/Tools/XMLConverter/include/Makefile.in~ ogre/Tools/XMLConverter/include/Makefile.in
+--- ogre/Tools/XMLConverter/include/Makefile.in~	2008-05-22 12:03:01.000000000 +0200
++++ ogre/Tools/XMLConverter/include/Makefile.in	2008-05-22 12:03:01.000000000 +0200
+@@ -223,9 +223,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ noinst_HEADERS = OgreXMLMeshSerializer.h \
+                  OgreXMLPrerequisites.h \
+-                 OgreXMLSkeletonSerializer.h \
+-                 tinystr.h \
+-                 tinyxml.h
++                 OgreXMLSkeletonSerializer.h
+ 
+ all: all-am
+ 


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ogre.spec	21 May 2008 21:28:35 -0000	1.28
+++ ogre.spec	22 May 2008 10:32:33 -0000	1.29
@@ -1,11 +1,11 @@
 Name:           ogre
-Version:        1.4.7
-Release:        3%{?dist}
+Version:        1.4.8
+Release:        2%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
-# This is http://downloads.sourceforge.net/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
+# This is http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
 # With the non free licensed headers under RenderSystems/GL/include/GL removed
 Source0:        ogre-%{version}-clean.tar.bz2
 Source1:        ogre-samples.sh
@@ -62,14 +62,10 @@
 
 
 %prep
-%setup -q -n ogrenew
+%setup -q -n ogre
 %patch0 -p1 -z .rpath
 %patch1 -p1 -z .glew
-%patch2 -p1
-# stop some CVS stuff from getting installed
-rm -r `find Docs Samples/Media -name CVS`
-# fix line-endings of Docs
-sed -i 's/\r//g' Docs/ChangeLog.html Docs/manual/*.html
+%patch2 -p1 -z .sys-tinyxml
 # 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
@@ -91,6 +87,7 @@
          api/classOgre_1_1DynLib.html \
          api/classOgre_1_1ParticleEmitter.html; do
   iconv -f ISO_8859-2 -t UTF8 $i > api/tmp
+  touch -r $i api/tmp
   mv api/tmp $i
 done
 # remove included tinyxml headers to ensure use of system headers
@@ -176,10 +173,15 @@
 
 
 %changelog
-* Wed May 21 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-3
+* Thu May 22 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.8-2
 - Rebuild for new cegui
 - Use system tinyxml (bz 447698)
 
+* Tue May 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.8-1
+- New upstream release 1.4.8
+- Warning as always with a new upstream ogre release this breaks the ABI
+  and changes the soname!
+
 * Sun Mar 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-2
 - Switch to freeimage as imagelibrary, as upstream is abandoning DevIL support
   (bz 435399)