rpms/Inventor/devel Inventor-2.1.5-s390x.patch, NONE, 1.1 Inventor.spec, 1.49, 1.50

[Dennis Gilmore]

Author: ausil

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

Modified Files:
	Inventor.spec 
Added Files:
	Inventor-2.1.5-s390x.patch 
Log Message:
sync patch from F-11 branch


Inventor-2.1.5-s390x.patch:
 SoOutput.c++ |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE Inventor-2.1.5-s390x.patch ---
diff -up inventor/lib/database/src/so/SoOutput.c++.s390x inventor/lib/database/src/so/SoOutput.c++
--- inventor/lib/database/src/so/SoOutput.c++.s390x	2009-04-22 23:09:59.000000000 +0200
+++ inventor/lib/database/src/so/SoOutput.c++	2009-04-22 23:09:25.000000000 +0200
@@ -1462,7 +1462,7 @@ SoOutput::findReference(const SoBase *ba
 
     // Generates a CC warning. Ho hum.
     if (refDict->find((unsigned long) base, ref))
-#if (_MIPS_SZPTR == 64 || __ia64__ || __x86_64__ || __powerpc64__)
+#if (_MIPS_SZPTR == 64 || __ia64__ || __x86_64__ || __powerpc64__ || __s390x__)
         referenceId = (int) ((unsigned long) ref);
 #else
 	referenceId = (int)ref;


Index: Inventor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- Inventor.spec	24 Jul 2009 15:33:52 -0000	1.49
+++ Inventor.spec	11 Nov 2009 14:42:54 -0000	1.50
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        36%{?dist}
+Release:        37%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -20,6 +20,8 @@ Patch1:		Inventor-2.1.5-30-31.diff
 Patch2:		Inventor-2.1.5-31-32.diff
 # Misc C++ modernization stuff
 Patch3:		Inventor-2.1.5-32-33.diff
+# s390x fixes
+Patch4:         Inventor-2.1.5-s390x.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -145,6 +147,7 @@ find -name CVS | xargs rm -rf
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 sed -i \
 -e 's,^IVPREFIX =.*$,IVPREFIX = %{_prefix},' \
@@ -344,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/Inventor/examples
 
 %changelog
+* Wed Nov 11 2009 Dennis Gilmore <dennis at ausil.us> - 2.1.5-37
+- apply s390x patch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.5-36
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild