From 04c706720915dd84e0270f3e4adbd9210145f8c403495291004a965ac0f4e5e3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 5 Dec 2012 13:34:31 +0000 Subject: [PATCH] Revert to previous known state, + OBS-URL: https://build.opensuse.org/package/show/science/gfan?expand=0&rev=8 --- gfan-format.patch | 275 ------------------------------------ gfan-permissive.patch | 18 --- gfan-remove-debug-code.diff | 27 ++++ gfan-respect-destdir.patch | 33 ----- gfan-warning.patch | 249 -------------------------------- gfan.changes | 13 +- gfan.spec | 59 +++----- 7 files changed, 49 insertions(+), 625 deletions(-) delete mode 100644 gfan-format.patch delete mode 100644 gfan-permissive.patch create mode 100644 gfan-remove-debug-code.diff delete mode 100644 gfan-respect-destdir.patch delete mode 100644 gfan-warning.patch diff --git a/gfan-format.patch b/gfan-format.patch deleted file mode 100644 index eafe0ac..0000000 --- a/gfan-format.patch +++ /dev/null @@ -1,275 +0,0 @@ ---- ./genericwalk.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./genericwalk.cpp 2011-04-27 13:42:52.227946066 -0600 -@@ -202,7 +202,7 @@ - g=newG; - - nflips++; -- fprintf(Stderr,"Flip %i, new size %i\n",nflips,g.size()); -+ fprintf(Stderr,"Flip %i, new size %zu\n",nflips,g.size()); - } - fprintf(Stderr,"Number of flips:%i\n",nflips); - ---- ./app_isgroebnerbasis.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_isgroebnerbasis.cpp 2011-04-27 13:48:16.474949962 -0600 -@@ -47,7 +47,7 @@ - IntegerVectorListList sums; - IntegerVectorList polytope=minkowski(polytopes,&sums); - -- fprintf(Stderr,"Number of extreme vertices in Minkowski sum: %i\n",polytope.size()); -+ fprintf(Stderr,"Number of extreme vertices in Minkowski sum: %zu\n",polytope.size()); - - bool isGroebnerBasis=false; - int counter=0; ---- ./polyhedralfan.cpp.orig 2011-01-25 08:33:17.000000000 -0700 -+++ ./polyhedralfan.cpp 2011-04-27 13:46:56.746866265 -0600 -@@ -604,7 +604,7 @@ - { - // log0 fprintf(Stderr,"rayComplexSymmetry - begin\n"); - PolyhedralFan ret(n); -- log1 fprintf(Stderr,"Computing rays of %i cones\n",cones.size()); -+ log1 fprintf(Stderr,"Computing rays of %zu cones\n",cones.size()); - for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++) - { - { -@@ -812,7 +812,7 @@ - SymmetryGroup localsym(n); - if(!sym)sym=&localsym; - set rays; -- log1 fprintf(Stderr,"Computing rays of %i cones\n",cones.size()); -+ log1 fprintf(Stderr,"Computing rays of %zu cones\n",cones.size()); - for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++) - { - { -@@ -1212,7 +1212,7 @@ - static int t; - if((t&1023)==0) - { -- fprintf(Stderr,"clist size:%i\n",clist.size()); -+ fprintf(Stderr,"clist size:%zu\n",clist.size()); - } - t++; - } ---- ./bergman.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./bergman.cpp 2011-04-27 13:45:37.266767581 -0600 -@@ -149,7 +149,7 @@ - if(0) - { - s=fullColoredIdeals(*g,false); -- fprintf(Stderr,"Full colored ideals computed, #=%i\n",s.size()); -+ fprintf(Stderr,"Full colored ideals computed, #=%zu\n",s.size()); - } - else - { -@@ -539,7 +539,7 @@ - while(!active.empty()) - { - log1 fprintf(Stderr,"\n-------------------------------------\n"); -- log1 fprintf(Stderr,"Size of active set: %i, Completed: %i\n",active.size(),ret.cones.size()); -+ log1 fprintf(Stderr,"Size of active set: %i, Completed: %zu\n",active.size(),ret.cones.size()); - log1 fprintf(Stderr,"-------------------------------------\n"); - AsciiPrinter p(Stderr); - ---- ./symmetry.cpp.orig 2011-01-25 08:33:17.000000000 -0700 -+++ ./symmetry.cpp 2011-04-27 13:43:45.571656038 -0600 -@@ -300,7 +300,7 @@ - l.push_back(*i); - } - P.printVectorList(l); -- fprintf(f,"Group order=%i\n",elements.size()); -+ fprintf(f,"Group order=%zu\n",elements.size()); - P.printString("Done printing SymmetryGroup.\n"); - } - ---- ./xfig.cpp.orig 2011-01-25 08:33:17.000000000 -0700 -+++ ./xfig.cpp 2011-04-27 13:46:06.770948094 -0600 -@@ -103,7 +103,7 @@ - { - if(vertices.size()) - { -- fprintf(f,"2 3 0 1 0 %i 50 0 25 0.000 0 0 -1 0 0 %i\n ",7,vertices.size()+1); -+ fprintf(f,"2 3 0 1 0 %i 50 0 25 0.000 0 0 -1 0 0 %zu\n ",7,vertices.size()+1); - - for(Polygon::const_iterator i=vertices.begin();i!=vertices.end();i++) - kickPoint(*i,mode); ---- ./lp_cdd.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./lp_cdd.cpp 2011-04-27 13:39:42.788631110 -0600 -@@ -1287,8 +1287,8 @@ - if(A->rowsize!=newLin.size()+newIn.size()) - { - fprintf(stderr,"A->rowsize: %i\n",(int)A->rowsize); -- fprintf(stderr,"newLin.size(): %i\n",newLin.size()); -- fprintf(stderr,"newIn.size(): %i\n",newIn.size()); -+ fprintf(stderr,"newLin.size(): %zu\n",newLin.size()); -+ fprintf(stderr,"newIn.size(): %zu\n",newIn.size()); - - dd_WriteMatrix(Stderr,A); - ---- ./minkowskisum.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./minkowskisum.cpp 2011-04-27 13:43:17.412392770 -0600 -@@ -27,7 +27,7 @@ - - assert(f); - { -- fprintf(f,"%i",polytopes.size()); -+ fprintf(f,"%zu",polytopes.size()); - TopcomPrinter p(f); - //AsciiPrinter p(f); - ---- ./xfig.h.orig 2011-01-25 08:33:19.000000000 -0700 -+++ ./xfig.h 2011-04-27 13:40:09.491983874 -0600 -@@ -52,7 +52,7 @@ - void endDrawLine() - { - assert(p.size()>0); -- fprintf(f," %i\n",p.size()); -+ fprintf(f," %zu\n",p.size()); - if(arrowOrigin) - fprintf(f,"\t 2 1 1.00 60.00 120.00\n"); - if(arrowTarget) ---- ./gmpallocator.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./gmpallocator.cpp 2011-04-27 13:44:36.363523526 -0600 -@@ -145,19 +145,19 @@ - //Debug - void *myAllocateFunctionD(size_t alloc_size) - { -- fprintf(stderr,"Allocating: %i bytes.\n",alloc_size); -+ fprintf(stderr,"Allocating: %zu bytes.\n",alloc_size); - return malloc(alloc_size); - } - - void *myReallocateFunctionD(void *ptr, size_t old_size, size_t new_size) - { -- fprintf(stderr,"Reallocating: %i --> %i bytes.\n",old_size,new_size); -+ fprintf(stderr,"Reallocating: %zu --> %zu bytes.\n",old_size,new_size); - return realloc(ptr,new_size); - } - - void myDeallocateFunctionD(void *ptr, size_t size) - { -- fprintf(stderr,"Freeing: %i bytes.\n",size); -+ fprintf(stderr,"Freeing: %zu bytes.\n",size); - return free(ptr); - } - ---- ./app_test.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_test.cpp 2011-04-27 13:49:04.826968542 -0600 -@@ -128,7 +128,7 @@ - - M[I]=minusOne*M[I]; - } -- fprintf(Stdout,"Extreme permutations (%i):\n",extreme.size()); -+ fprintf(Stdout,"Extreme permutations (%zu):\n",extreme.size()); - P.printVectorList(extreme); - } - ---- ./buchberger.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./buchberger.cpp 2011-04-27 13:41:04.116614389 -0600 -@@ -540,7 +540,7 @@ - { - static int t; - t++; -- if((t&31)==0)fprintf(Stderr," spolys:%i\n",sPolynomials.size()); -+ if((t&31)==0)fprintf(Stderr," spolys:%zu\n",sPolynomials.size()); - } - - { -@@ -565,7 +565,7 @@ - { - static int t; - if(((++t)&=31)==0) -- fprintf(Stderr,"gsize:%i spolys:%i\n",g->size()+1,sPolynomials.size()); -+ fprintf(Stderr,"gsize:%zu spolys:%zu\n",g->size()+1,sPolynomials.size()); - } - PolynomialSet::iterator j=g->end();j--; - updatePairs(sPolynomials,g,&redundantOnes,j,indexj,truncationDegree,&grading); ---- ./halfopencone.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./halfopencone.cpp 2011-04-27 13:47:51.531488017 -0600 -@@ -555,14 +555,14 @@ - { - HalfOpenConeList surface=tropicalHyperSurface(*i); - -- fprintf(Stderr,"Number of cones in current intersection:%i\n",intersection.size()); -- fprintf(Stderr,"Number of cones in next surface:%i\n",surface.size()); -+ fprintf(Stderr,"Number of cones in current intersection:%zu\n",intersection.size()); -+ fprintf(Stderr,"Number of cones in next surface:%zu\n",surface.size()); - - fprintf(Stderr,"A\n"); - intersection=refinement(intersection,surface); - fprintf(Stderr,"B\n"); - } -- fprintf(Stderr,"%i",intersection.size()); -+ fprintf(Stderr,"%zu",intersection.size()); - - return intersection; - } ---- ./app_normalfancleanup.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_normalfancleanup.cpp 2011-04-27 13:51:05.227545050 -0600 -@@ -71,7 +71,7 @@ - FILE *f=fopen("iteraTIon","w"); - if(f) - { -- fprintf(f,"%i:%i\n",a,l2.size()); -+ fprintf(f,"%i:%zu\n",a,l2.size()); - fclose(f); - } - } ---- ./app_secondaryfan.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_secondaryfan.cpp 2011-04-27 13:50:21.635232740 -0600 -@@ -142,7 +142,7 @@ - - while(1) - { -- fprintf(stdout,"Triangles in current triangulation:%i\n",a.bases.size()); -+ fprintf(stdout,"Triangles in current triangulation:%zu\n",a.bases.size()); - PolyhedralCone C=a.secondaryCone(); - - C.canonicalize(); -@@ -198,7 +198,7 @@ - - while(1) - { -- fprintf(stdout,"Triangles in current triangulation:%i\n",a.bases.size()); -+ fprintf(stdout,"Triangles in current triangulation:%zu\n",a.bases.size()); - // PolyhedralCone C=a.secondaryCone(); - - // C.canonicalize(); -@@ -214,7 +214,7 @@ - { - Triangulation2 b=a; - b.flipNew(-*i); -- fprintf(stdout,"Triangles in new triangulation:%i\n",b.bases.size()); -+ fprintf(stdout,"Triangles in new triangulation:%zu\n",b.bases.size()); - - if(b.bases.size()==abortAtSize) - { ---- ./app_intsinpolytope.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_intsinpolytope.cpp 2011-04-27 13:49:42.202664015 -0600 -@@ -104,7 +104,7 @@ - } - } - -- fprintf(stderr,"Sets to test: %i\n",setsToCheck.size()); -+ fprintf(stderr,"Sets to test: %zu\n",setsToCheck.size()); - - set > ret; - for(set >::const_iterator i=setsToCheck.begin();i!=setsToCheck.end();i++) -@@ -118,7 +118,7 @@ - if(isPartOfAZBasis(l))ret.insert(*i); - } - -- fprintf(stderr,"Produced sets: %i\n",ret.size()); -+ fprintf(stderr,"Produced sets: %zu\n",ret.size()); - - return ret; - } ---- ./app_tropicaltraverse.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_tropicaltraverse.cpp 2011-04-27 13:48:41.939379788 -0600 -@@ -156,7 +156,7 @@ - BergmanFan f=bergman(coneGroebnerBasis,idealGroebnerBasis,&s); - f.computeMultiplicities(); - /* log1 fprintf(Stderr,"Is simplicial: %s\n",f.isSimplicial()?"true":"false");*/ -- log1 fprintf(Stderr,"Order of input symmetry group: %i\n",s.elements.size()); -+ log1 fprintf(Stderr,"Order of input symmetry group: %zu\n",s.elements.size()); - log1 fprintf(Stderr,"Number of maximal cones: %i\n",f.numberOfMaximalCones()); - log1 fprintf(Stderr,"Modulo the homogeneity space:\n"); - log1 AsciiPrinter(Stderr).printVectorList(hv); diff --git a/gfan-permissive.patch b/gfan-permissive.patch deleted file mode 100644 index 1e24ae0..0000000 --- a/gfan-permissive.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up gfan0.5/app_main.cpp.orig gfan0.5/app_main.cpp ---- gfan0.5/app_main.cpp.orig 2012-07-05 12:10:18.377378026 -0400 -+++ gfan0.5/app_main.cpp 2012-07-05 12:10:24.414378093 -0400 -@@ -76,14 +76,6 @@ public: - - int main() - { -- if(name1[0]==0) -- { -- debug<<"This is the Gfan program for computing Groebner fans and tropical varieties.\n" -- "Use the command \"gfan list\" to view all subcommands.\n" -- "The command \"gfan\" is deprecate for computing all Groebner bases of an ideal.\n" -- "Please use subcommand \"gfan _bases\" instead. Awaiting input. -D to end.\n"; -- } -- - LexicographicTermOrder myOrder; - - PolynomialSet g=FileParser(Stdin).parsePolynomialSetWithRing(); diff --git a/gfan-remove-debug-code.diff b/gfan-remove-debug-code.diff new file mode 100644 index 0000000..1f30ea7 --- /dev/null +++ b/gfan-remove-debug-code.diff @@ -0,0 +1,27 @@ +From: Jan Engelhardt +Date: 2012-12-05 14:29:02.523487457 +0100 +Upstream: dead? + +build: resolve compile error due to doubly-defined variable + +[ 42s] g++ -DPACKAGE_NAME=\"gfan\" -DPACKAGE_TARNAME=\"gfan\" -DPACKAGE_VERSION=\"0.5\" -DPACKAGE_STRING=\"gfan\ 0.5\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"gfan\" -DVERSION=\"0.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -I. -DGMPRATIONAL -Wuninitialized -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -Wno-sign-compare -Wno-reorder -Wno-unused -Wno-unused-result -c -o app_normalfancleanup.o app_normalfancleanup.cpp +[ 42s] app_minkowski.cpp: In member function 'virtual int MinkowskiApplication::main()': +[ 42s] app_minkowski.cpp:163:17: error: redeclaration of 'int i' +[ 42s] app_minkowski.cpp:134:40: error: 'std::list >::const_iterator i' previously declared here +--- + app_minkowski.cpp | 2 -- + 1 file changed, 2 deletions(-) + +Index: gfan0.5/app_minkowski.cpp +=================================================================== +--- gfan0.5.orig/app_minkowski.cpp ++++ gfan0.5/app_minkowski.cpp +@@ -160,8 +160,6 @@ public: + //log0 fprintf(Stderr,"4"); + f.insert(c); + //log0 fprintf(Stderr,"5\n"); +- static int i; +- //log0 fprintf(Stderr,"inserted:%i\n",++i); + } + log1 fprintf(Stderr,"Resolving symmetries.\n"); + diff --git a/gfan-respect-destdir.patch b/gfan-respect-destdir.patch deleted file mode 100644 index 4008a42..0000000 --- a/gfan-respect-destdir.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.orig 2011-01-25 08:33:19.000000000 -0700 -+++ Makefile 2011-04-25 16:07:52.441724570 -0600 -@@ -308,11 +308,11 @@ - - all: $(MAIN) - --$(BINDIR): $(PREFIX) -- $(MKDIR) $(BINDIR) -+$(DESTDIR)$(BINDIR): $(DESTDIR)$(PREFIX) -+ $(MKDIR) $(DESTDIR)$(BINDIR) - --$(PREFIX): -- $(MKDIR) $(PREFIX) -+$(DESTDIR)$(PREFIX): -+ $(MKDIR) -p $(DESTDIR)$(PREFIX) - - default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS) - -@@ -419,11 +419,11 @@ - - clean: - /bin/rm -f *.o $(EXECS) $(MAIN) --install: $(BINDIR) -- cp $(EXECS) $(BINDIR) -+install: $(DESTDIR)$(BINDIR) -+ cp $(EXECS) $(DESTDIR)$(BINDIR) - # cp $(EXECS) /usr/local/bin - # ./gfan installlinks --path $(BINDIR)/ -- cd $(BINDIR) && ./gfan installlinks -+ cd $(DESTDIR)$(BINDIR) && ./gfan installlinks - library: - /bin/rm -f gfanlib/*.a - /bin/rm -f gfanlib/*.o diff --git a/gfan-warning.patch b/gfan-warning.patch deleted file mode 100644 index 4b0b40a..0000000 --- a/gfan-warning.patch +++ /dev/null @@ -1,249 +0,0 @@ ---- ./app_minkowski.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_minkowski.cpp 2012-01-09 11:28:20.926240318 -0700 -@@ -160,7 +160,7 @@ public: - //log0 fprintf(Stderr,"4"); - f.insert(c); - //log0 fprintf(Stderr,"5\n"); -- static int i; -+ //static int i; - //log0 fprintf(Stderr,"inserted:%i\n",++i); - } - log1 fprintf(Stderr,"Resolving symmetries.\n"); ---- ./app_test.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_test.cpp 2012-01-09 11:27:29.305437764 -0700 -@@ -1,5 +1,7 @@ - #include - #include -+#include -+#include - #include "parser.h" - #include "printer.h" - #include "polynomial.h" -@@ -193,10 +195,7 @@ public: - { - outputName=outputName+"New"; - } -- { -- string t="rm "+outputName; -- system(t.c_str()); -- } -+ unlink(outputName.c_str()); - string command3="cat <"+input+"|"+string(command2)+">"+outputName; - cerr<<"Running command:\""< subFolderNames() - { --#define tempName "GfAnTeMpTeStS" -- char command[256]; -- system("rm "tempName); -- sprintf(command,"ls %s>" tempName ,testSuiteFolderOption.getValue()); -- system(command); -- - list ret; -- FILE *f=fopen(tempName,"r"); -- assert(f); -- char name[256]; -- while(fgets(name,255,f)) -+ DIR *dir = opendir(testSuiteFolderOption.getValue()); -+ struct dirent *dirent; -+ -+ assert(dir); -+ for (struct dirent *ent = readdir(dir); ent; ent = readdir(dir)) - { -- for(int i=0;i<255 && name[i];i++)if(name[i]=='\n'){name[i]=0;} -- if(name[0]>='0' && name[0]<='9')ret.push_back(string(testSuiteFolderOption.getValue())+"/"+string(name)); -+ if (ent->d_name[0]>='0' && ent->d_name[0]<='9') -+ ret.push_back(string(testSuiteFolderOption.getValue())+"/"+string(ent->d_name)); - } -- fclose(f); -+ closedir(dir); - return ret; - } - ---- ./gfanlib_vector.h.orig 2011-01-25 08:33:18.000000000 -0700 -+++ ./gfanlib_vector.h 2012-01-09 11:27:29.307437580 -0700 -@@ -288,6 +288,7 @@ public: - f<<*i; - } - f<<")"; -+ return f; - } - typ gcd()const - { ---- ./app_tropicalintersection.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_tropicalintersection.cpp 2012-01-09 11:27:29.304437850 -0700 -@@ -42,6 +42,7 @@ public: - AsciiPrinter(Stdout)<<"The following vector is in intersection, but initial ideal contains a monomial:\n"< - #include - #include -+#include -+#include - #include - #include - -@@ -546,10 +548,11 @@ void Application::makeSymbolicLinks(cons - if(all || p->includeInDefaultInstallation()) - if(strlen(p->name())>0) - { -- char c[1024]; -- sprintf(c,"ln -s %s%s %s%s%s\n",path,name,path,name,p->name()); -- fprintf(stderr,"%s",c); -- system(c); -+ char c[PATH_MAX], d[PATH_MAX]; -+ snprintf(c,PATH_MAX,"%s%s",path,name); -+ snprintf(d,PATH_MAX,"%s%s%s",path,name,p->name()); -+ fprintf(stderr,"ln -s %s %s\n",c,d); -+ symlink(c,d); - } - p=p->next; - } ---- ./field_rationals.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./field_rationals.cpp 2012-01-09 11:27:29.300438251 -0700 -@@ -326,17 +326,17 @@ const char *FieldRationalsImplementation - return "GmpRationals"; - } - --/*FieldRationals::FieldRationals(): -+#if 0 -+FieldRationals::FieldRationals(): - Field(new FieldRationalsImplementation()) - { - /* fprintf(Stderr,"Adding field rationals\n"); - next=list; - list=this; - */ --/* - log2 fprintf(Stderr,"Initializing field Rationals\n"); - } --*/ -+#endif - //FieldRationals Q; - Field Q(new FieldRationalsImplementation()); - ---- ./vektor.cpp.orig 2011-01-25 08:33:17.000000000 -0700 -+++ ./vektor.cpp 2012-01-09 11:27:29.303437946 -0700 -@@ -96,7 +96,7 @@ int gcdGFAN(int r, int s) - int gcdOfVector(IntegerVector const &v) - { - int ret=0; -- for(int i=0;i >*conelist/*, ZMatrix *multiplicities*/)const - { ---- ./polymakefile.cpp.orig 2011-01-25 08:33:17.000000000 -0700 -+++ ./polymakefile.cpp 2012-01-09 11:27:29.310437290 -0700 -@@ -371,7 +371,7 @@ static list readIntList(istream &s) - { - list ret; - int c=s.peek(); -- while((c>='0') && (c<='9')|| (c==' ')) -+ while((c>='0' && c<='9')|| c==' ') - { - // fprintf(Stderr,"?\n"); - int r; ---- ./app_fancoarsening.cpp.orig 2011-01-25 08:33:15.000000000 -0700 -+++ ./app_fancoarsening.cpp 2012-01-09 11:27:29.299438352 -0700 -@@ -33,12 +33,14 @@ public: - return false; - } - -+#if 0 - IntegerVectorList inequalitiesForCone(IntegerVector const &codim1interior, IntegerVector const &newDirection) - { - - int i=0; - - } -+#endif - - const char *helpText() - { ---- ./gfanlib_polymakefile.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./gfanlib_polymakefile.cpp 2012-01-09 11:27:29.306437673 -0700 -@@ -51,7 +51,7 @@ static list readIntList(istream &s) - { - list ret; - int c=s.peek(); -- while((c>='0') && (c<='9')|| (c==' ')) -+ while((c>='0' && c<='9')|| c==' ') - { - // fprintf(Stderr,"?\n"); - int r; ---- ./gfanlib_zcone.cpp.orig 2011-01-25 08:33:16.000000000 -0700 -+++ ./gfanlib_zcone.cpp 2012-01-09 11:27:29.309437387 -0700 -@@ -726,6 +726,7 @@ std::ostream &operator<<(std::ostream &f - f<size(); -@@ -963,7 +963,7 @@ bool fastIsFacet(IntegerVectorList const - } - } - */ --/* int bestEntry=-1; -+ int bestEntry=-1; - int bestCount=2000000000; - int bestValue=0; - for(int j=0;j= 2 %define with_pdf 1 %if 0%{?with_pdf} -BuildRequires: texlive-latex +BuildRequires: texlive-latex %if 0%{?suse_version} >= 1230 BuildRequires: texlive-bibtex, texlive-dvips, texlive-ntgclass, texlive-ulem %endif @@ -56,34 +44,25 @@ Gfan is a software package for computing Gröbner fans and tropical varieties. These are polyhedral fans associated to polynomial ideals. %package -n %lname -Summary: Library for calculation of Gröbner fans -Group: System/Libraries +Summary: Library for calculation of Gröbner fans +Group: System/Libraries %description -n %lname Gfan is a software package for computing Gröbner fans and tropical varieties. These are polyhedral fans associated to polynomial ideals. %package -n libgfan-devel -Summary: Development files for libgfan -Group: Development/Libraries/C and C++ -Requires: %lname = %version +Summary: Development files for libgfan +Group: Development/Libraries/C and C++ +Requires: %lname = %version %description -n libgfan-devel Gfan is a software package for computing Gröbner fans and tropical varieties. These are polyhedral fans associated to polynomial ideals. %prep -%setup -q -n %{name}%{version} -%patch0 -p1 -%patch1 -%patch2 -%patch3 -%patch4 -p1 - -# Point to where the TOPCOM binaries will be installed -sed -i \ - "s|^#define MINKOWSKIPROG.*|#define MINKOWSKIPROGRAM \"%{_bindir}/essai\"|" \ - minkowskisum.cpp +%setup -qn %name%version +%patch -P 1 -P 2 -P 3 -P 4 -p1 %build autoreconf -fi; @@ -101,8 +80,8 @@ make -C doc %{?_smp_mflags}; %install b="%buildroot"; -%makeinstall -find "$b" -type f -name "*.la" -delete; +make install DESTDIR="$b"; +rm -f "$b/%_libdir"/*.la; %files %defattr(-,root,root)