rpms/ogre/F-7 ogre-1.2.5-ppc64.patch,NONE,1.1 ogre.spec,1.7,1.8

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29412

Modified Files:
	ogre.spec 
Added Files:
	ogre-1.2.5-ppc64.patch 
Log Message:
* Thu May 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.5-2.fc7.1
- Fix building on ppc64
- Give this version an extra .1 after the disttag, as an fc7 tag was
  accidentely created in the F-8 tree


ogre-1.2.5-ppc64.patch:

--- NEW FILE ogre-1.2.5-ppc64.patch ---
--- ogrenew/OgreMain/include/OgrePlatform.h~	2007-05-24 10:52:23.000000000 +0200
+++ ogrenew/OgreMain/include/OgrePlatform.h	2007-05-24 10:52:23.000000000 +0200
@@ -91,7 +91,7 @@
 #endif
 
     /* Find the arch type */
-#if defined(__x86_64__) || defined(_M_X64)
+#if defined(__LP64__)
 #   define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64
 #else
 #   define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/F-7/ogre.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ogre.spec	16 Feb 2007 13:08:05 -0000	1.7
+++ ogre.spec	24 May 2007 11:22:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}.1
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPL
 Group:          System Environment/Libraries
@@ -9,6 +9,7 @@
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
 Patch1:         ogre-1.2.2-soname.patch
+Patch2:         ogre-1.2.5-ppc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel SDL-devel freetype-devel
 BuildRequires:  libglademm24-devel libsigc++20-devel
@@ -60,6 +61,7 @@
 %setup -q -n ogrenew
 %patch0 -p1 -z .rpath
 %patch1 -p1 -z .soname
+%patch2 -p1 -z .ppc64
 # sigh stop autoxxx from rerunning because of our patches above.
 touch aclocal.m4
 touch configure
@@ -175,6 +177,11 @@
 
 
 %changelog
+* Thu May 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.5-2.fc7.1
+- Fix building on ppc64
+- Give this version an extra .1 after the disttag, as an fc7 tag was
+  accidentely created in the F-8 tree
+
 * Fri Feb 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.5-1
 - New upstream release 1.2.5