rpms/Macaulay2/devel Macaulay2-0.9.8-64bit.patch, NONE, 1.1 Macaulay2.spec, 1.15, 1.16

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Added Files:
	Macaulay2-0.9.8-64bit.patch 
Log Message:
* Fri May 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.4.cvs20060327
- 64bit patch (#188709)


Macaulay2-0.9.8-64bit.patch:

--- NEW FILE Macaulay2-0.9.8-64bit.patch ---
--- M2/Macaulay2/e/linalgGB/linalgGB.cpp.64bit	2005-08-12 11:37:57.000000000 -0500
+++ M2/Macaulay2/e/linalgGB/linalgGB.cpp	2006-05-05 08:12:19.000000000 -0500
@@ -191,7 +191,7 @@
   bool found = lookup->search(ce.monom, b);
   if (found)
     {
-      int which = reinterpret_cast<int>(b->bag);
+      int which = (reinterpret_cast<long>(b->bag));
       uninterned_monomial um = H.reserve(MONOMIAL_LENGTH(ce.monom));
       monomial m;
       monomial_quotient(ce.monom, gb[which]->f.monoms[0], um);


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Macaulay2.spec	12 Apr 2006 14:30:33 -0000	1.15
+++ Macaulay2.spec	5 May 2006 13:14:30 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.8
-Release: 0.3.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
@@ -13,7 +13,7 @@
 Source:	 M2-0.9.8-%{beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # "64 bit build fails", http://bugzilla.redhat.com/bugzilla/188709
-ExcludeArch: x86_64 ppc64
+#ExcludeArch: x86_64 ppc64
 
 Source1: Macaulay2.png
 Source2: Macaulay2.desktop
@@ -23,6 +23,7 @@
 Patch2: Macaulay2-0.9.8-cout.patch
 Patch3: Macaulay2-0.9.8-infodir.patch
 Patch4: Macaulay2-0.9.8-gcc4.patch
+Patch5: Macaulay2-0.9.8-64bit.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel
@@ -69,6 +70,7 @@
 %patch2 -p1 -b .cout
 %patch3 -p1 -b .infodir
 %patch4 -p1 -b .gcc4
+%patch5 -p1 -b .64bit
 
 
 %build
@@ -142,6 +144,9 @@
 
 
 %changelog
+* Fri May 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.4.cvs20060327
+- 64bit patch (#188709)
+
 * Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.3.cvs20060327 
 - omit x86_64, for now (#188709)