rpms/factory/devel factory-2.0.5-gcc34.patch, NONE, 1.1 factory.spec, 1.3, 1.4

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

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

Modified Files:
	factory.spec 
Added Files:
	factory-2.0.5-gcc34.patch 
Log Message:
Merge fix for FC3/GCC 3.4 build.

factory-2.0.5-gcc34.patch:

--- NEW FILE factory-2.0.5-gcc34.patch ---
diff -Nur factory-orig/fac_cantzass.cc factory/fac_cantzass.cc
--- factory-orig/fac_cantzass.cc	2003-02-14 16:53:27.000000000 +0100
+++ factory/fac_cantzass.cc	2004-10-06 22:17:06.453105368 +0200
@@ -83,10 +83,14 @@
             G = distinctDegreeFactorFFGF( i.getItem().factor(), q );
         for ( j = G; j.hasItem(); ++j ) {
             if ( numext > 0 ) {
-                if ( numext == 1 )
-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, AlgExtRandomF( alpha ) );
-                else
-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, AlgExtRandomF( alpha, beta ) );
+	      if ( numext == 1 ) {
+		    AlgExtRandomF tmpalpha( alpha );
+                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalpha );
+	      }
+	      else {
+		    AlgExtRandomF tmpalphabeta( alpha, beta );
+                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalphabeta );
+	      }
             }
             else  if ( galoisfield )
                 HH = CantorZassenhausFactorFFGF( j.getItem().factor(), j.getItem().exp(), q, GFRandom() );


Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- factory.spec	8 Nov 2004 04:17:05 -0000	1.3
+++ factory.spec	23 Nov 2004 20:51:38 -0000	1.4
@@ -4,10 +4,11 @@
 Name:    factory	
 Epoch:	 0
 Version: 2.0.4 
-Release: 0.fdr.4.b%{?dist_tag}.2
+Release: 0.5.b%{?dist_tag}
 License: GPL	
 Url:   	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
 Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-4b.tar.gz
+Patch:   factory-2.0.5-gcc34.patch
 Group:   System Environment/Libraries	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch -p1 -b .gcc34
 
 
 %build
@@ -69,6 +71,9 @@
 
 
 %changelog
+* Tue Nov 23 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.0.4-0.5.b
+- Merge my patch from fedora.us #2095, so this builds at least.
+
 * Mon Nov 17 2003 Rex Dieter <rexdieter at sf.net> 0:2.0.4-0.fdr.4.b
 - update macros