rpms/factory/devel factory-64bit.patch, NONE, 1.1 factory.spec, 1.9, 1.10

[Jeremy Katz (katzj)]

Author: katzj

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

Modified Files:
	factory.spec 
Added Files:
	factory-64bit.patch 
Log Message:
* Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 2.0.5-6
- fix build on 64bit arches


factory-64bit.patch:

--- NEW FILE factory-64bit.patch ---
--- factory/imm.h.64bit	2005-05-26 10:24:44.000000000 -0400
+++ factory/imm.h	2005-05-26 10:27:35.000000000 -0400
@@ -41,7 +41,7 @@
 
 inline int imm2int ( const InternalCF * const imm )
 {
-    return (int)imm >> 2;
+    return (int)(long)imm >> 2;
 }
 
 inline InternalCF * int2imm ( int i )
@@ -85,7 +85,7 @@
 inline int is_imm ( const InternalCF * const ptr )
 {
     // returns 0 if ptr is not immediate
-    return ( (int)ptr & 3 );
+    return ( (int)(long)ptr & 3 );
 }
 
 //{{{ inline int imm_isone, imm_isone_p, imm_isone_gf ( const InternalCF * const ptr )


Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- factory.spec	23 May 2005 00:06:40 -0000	1.9
+++ factory.spec	26 May 2005 14:36:37 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
 Version: 2.0.5
-Release: 5
+Release: 6
 
 License: GPL
 URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch1: factory-2.0.5-gcc34.patch
+Patch2: factory-64bit.patch
 
 BuildRequires: gmp-devel
 
@@ -35,6 +36,7 @@
 %setup -q -n %{name}
 
 %patch1 -p1 -b .gcc34
+%patch2 -p1 -b .64bit
 
 
 %build
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 2.0.5-6
+- fix build on 64bit arches
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.0.5-5
 - rebuild on all arches