Changeset from: mschwendt
Update of /cvs/extras/rpms/factory/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv8200/FC-2
Modified Files:
.cvsignore factory.spec sources
Added Files:
factory-2.0.5-gcc34.patch
Log Message:
auto-import factory-2.0.5-0.fdr.3.2 on branch FC-2 from factory-2.0.5-0.fdr.3.2.src.rpm
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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/factory/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:16:53 -0000 1.2
+++ .cvsignore 4 Dec 2004 09:38:14 -0000 1.3
@@ -1 +1 @@
-factory-2-0-4b.tar.gz
+factory-2-0-5.tar.gz
Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/FC-2/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 4 Dec 2004 09:38:14 -0000 1.4
@@ -3,14 +3,16 @@
Summary: A C++ class library for multivariate polynomial data
Name: factory
Epoch: 0
-Version: 2.0.4
-Release: 0.fdr.4.b%{?dist_tag}.2
+Version: 2.0.5
+Release: 0.fdr.3%{?dist_tag}.2
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
+Source:
http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch1: factory-2.0.5-gcc34.patch
+
BuildRequires: gmp-devel
%description
@@ -32,6 +34,8 @@
%prep
%setup -q -n %{name}
+%patch1 -p1 -b .gcc34
+
%build
# Macaulay2's build instructions say to use --disable-streamio
@@ -69,6 +73,15 @@
%changelog
+* Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-0.fdr.3
+- (2nd try at) gcc34 patch
+
+* Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-0.fdr.2
+- gcc34 patch
+
+* Fri Oct 1 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-0.fdr.1
+- factory-2.0.5
+
* Mon Nov 17 2003 Rex Dieter <rexdieter at sf.net> 0:2.0.4-0.fdr.4.b
- update macros
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/factory/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:16:53 -0000 1.2
+++ sources 4 Dec 2004 09:38:14 -0000 1.3
@@ -1 +1 @@
-7ca5e7b84485b372bd9a01db74a1d828 factory-2-0-4b.tar.gz
+ccb98926a93b0fc90711730790c56ac5 factory-2-0-5.tar.gz