From 23499587a93b4a39e070c7f608c072174179b625 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 12 2006 17:35:30 +0000 Subject: - 0.9.10 --- diff --git a/.cvsignore b/.cvsignore index 0e229b5..b254d5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -M2-0.9.8-cvs20060327.tar.bz2 +Macaulay2-0.9.10-20060710svn.tar.bz2 diff --git a/Macaulay2-0.9.10-cout.patch b/Macaulay2-0.9.10-cout.patch new file mode 100644 index 0000000..4737679 --- /dev/null +++ b/Macaulay2-0.9.10-cout.patch @@ -0,0 +1,17 @@ +--- Macaulay2-0.9.10/Macaulay2/e/x_factor.cpp.cout 2006-06-20 15:50:05.000000000 -0500 ++++ Macaulay2-0.9.10/Macaulay2/e/x_factor.cpp 2006-07-10 14:33:16.000000000 -0500 +@@ -266,10 +266,10 @@ + + // debugging display routines to be called from gdb + // needs factory to be configured without option --disable-streamio +- void showvar(Variable &t) { cout << t << endl; } +- void showcf(CanonicalForm &t) { cout << t << endl; } +- void showcfl(CFList &t) { cout << t << endl; } +- void showcffl(CFFList &t) { cout << t << endl; } ++ //void showvar(Variable &t) { cout << t << endl; } ++ //void showcf(CanonicalForm &t) { cout << t << endl; } ++ //void showcfl(CFList &t) { cout << t << endl; } ++ //void showcffl(CFFList &t) { cout << t << endl; } + static struct enter_factory foo2; + static struct enter_M2 b2; + diff --git a/Macaulay2-0.9.8-64bit.patch b/Macaulay2-0.9.8-64bit.patch deleted file mode 100644 index d3b9291..0000000 --- a/Macaulay2-0.9.8-64bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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(b->bag); -+ int which = (reinterpret_cast(b->bag)); - uninterned_monomial um = H.reserve(MONOMIAL_LENGTH(ce.monom)); - monomial m; - monomial_quotient(ce.monom, gb[which]->f.monoms[0], um); diff --git a/Macaulay2-0.9.8-cout.patch b/Macaulay2-0.9.8-cout.patch deleted file mode 100644 index 45bcaad..0000000 --- a/Macaulay2-0.9.8-cout.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- M2/Macaulay2/e/x_factor.cpp.std_namespace 2005-08-31 08:28:45.000000000 -0500 -+++ M2/Macaulay2/e/x_factor.cpp 2006-02-10 13:24:34.000000000 -0600 -@@ -31,10 +31,11 @@ - - // debugging display routines to be called from gdb - // needs factory to be configured without option --disable-streamio --void showvar(Variable &t) { cout << t << endl; } --void showcf(CanonicalForm &t) { cout << t << endl; } --void showcfl(CFList &t) { cout << t << endl; } --void showcffl(CFFList &t) { cout << t << endl; } -+//using namespace std; -+//void showvar(Variable &t) { cout << t << endl; } -+//void showcf(CanonicalForm &t) { cout << t << endl; } -+//void showcfl(CFList &t) { cout << t << endl; } -+//void showcffl(CFFList &t) { cout << t << endl; } - - extern "C" { - extern void factory_setup_2(); diff --git a/Macaulay2-0.9.8-gcc4.patch b/Macaulay2-0.9.8-gcc4.patch deleted file mode 100644 index 3f8da89..0000000 --- a/Macaulay2-0.9.8-gcc4.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- M2/Macaulay2/e/linalgGB/MonomialSet.hpp.gcc4 2006-04-10 13:22:14.000000000 -0500 -+++ M2/Macaulay2/e/linalgGB/MonomialSet.hpp 2006-04-10 13:22:32.000000000 -0500 -@@ -16,7 +16,7 @@ - }; - - public: -- MonomialSet::MonomialSet(); -+ MonomialSet(); - - static MonomialSet *make(); - ---- M2/Macaulay2/e/Eschreyer.hpp.gcc4 2006-04-10 13:28:44.000000000 -0500 -+++ M2/Macaulay2/e/Eschreyer.hpp 2006-04-10 13:29:02.000000000 -0500 -@@ -53,7 +53,7 @@ - int find_divisor(const MonomialIdeal * mi, const int *exponents, int &result); - // Returns the index of the least element in the monomial order which divides. - -- void GBKernelComputation::wipe_unneeded_terms(gbvector * & f); -+ void wipe_unneeded_terms(gbvector * & f); - // removes every term of f which is not a lead term of some element of gb. - - gbvector * s_pair(gbvector * syz); ---- M2/Macaulay2/e/x_factor.cpp.gcc4 2006-04-10 13:35:25.000000000 -0500 -+++ M2/Macaulay2/e/x_factor.cpp 2006-04-10 13:35:47.000000000 -0500 -@@ -56,8 +56,8 @@ - __gmp_reallocate_func = save_gmp_reallocate_func; - __gmp_free_func = save_gmp_free_func; - } -- enter_factory:: enter_factory() { enter(); } -- enter_factory::~enter_factory() { exit(); } -+ enter_factory() { enter(); } -+ ~enter_factory() { exit(); } - }; - - struct enter_M2 { -@@ -75,8 +75,8 @@ - __gmp_reallocate_func = save_gmp_reallocate_func; - __gmp_free_func = save_gmp_free_func; - } -- enter_M2:: enter_M2() { enter(); } -- enter_M2::~enter_M2() { exit(); } -+ enter_M2() { enter(); } -+ ~enter_M2() { exit(); } - }; - - static MP_INT toInteger(CanonicalForm h) { ---- M2/Macaulay2/e/mat-symm.cpp.gcc4 2006-04-10 13:34:41.000000000 -0500 -+++ M2/Macaulay2/e/mat-symm.cpp 2006-04-10 13:34:54.000000000 -0500 -@@ -4,7 +4,7 @@ - class SymmMatrix - { - public: -- static MatrixOrNull * SymmMatrix::symmetricPower(const Matrix *m0, int p) -+ static MatrixOrNull * symmetricPower(const Matrix *m0, int p) - { - if (m0->n_rows() != 1) - { ---- M2/Macaulay2/c/compat.h.gcc4 2003-11-12 08:22:54.000000000 -0600 -+++ M2/Macaulay2/c/compat.h 2006-04-10 13:27:34.000000000 -0500 -@@ -99,7 +99,11 @@ - int open(const char *, int, ...); - #endif - --#ifdef __STDC__ -+/* ifdef __STDC__ */ -+/* the following doesn't compile on linux w/gcc-4.x, so -+ maybe use some sun-specific define instead? -- Rex -+*/ -+#if 0 - int close(int); - int fputs(const char *,FILE *); /* needed for sunos 4.1 */ - int fprintf(FILE *,const char *,...); /* needed for sunos 4.1 */ diff --git a/Macaulay2.spec b/Macaulay2.spec index 2aadbdb..079cd9c 100644 --- a/Macaulay2.spec +++ b/Macaulay2.spec @@ -1,27 +1,26 @@ -%define beta cvs20060327 +%define beta 20060710svn Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 -Version: 0.9.8 -Release: 0.5.%{beta}%{?dist} +Version: 0.9.10 +Release: 0.2.%{beta}%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ #Source: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}.beta.tar.gz -Source: M2-0.9.8-%{beta}.tar.bz2 +Source0: Macaulay2-%{version}-%{beta}.tar.bz2 +Source1: Macaulay2-svn_checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source1: Macaulay2.png -Source2: Macaulay2.desktop +Source10: Macaulay2.png +Source11: Macaulay2.desktop Patch0: Macaulay2-0.9.8-optflags.patch Patch1: Macaulay2-0.9.8-htmlview.patch -Patch2: Macaulay2-0.9.8-cout.patch +Patch2: Macaulay2-0.9.10-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 @@ -41,7 +40,7 @@ BuildRequires: byacc BuildRequires: info # etags BuildRequires: emacs-common -Source10: etags.sh +Source20: etags.sh # M2-help Requires: htmlview @@ -61,7 +60,7 @@ Group: Applications/Engineering Requires: %{name} = %{version}-%{release} ## %{_datadir}/emacs/site-lisp #Requires: emacs-common -## /usr/bin/emacs +## %{_bindir}/emacs Requires: emacs %description emacs %{summary}. @@ -69,16 +68,16 @@ Requires: emacs %prep -%setup -q -n M2 +%setup -q -install -m755 %{SOURCE10} ./etags +install -p -m755 %{SOURCE20} ./etags %patch0 -p1 -b .optflags %patch1 -p1 -b .htmlview %patch2 -p1 -b .cout %patch3 -p1 -b .infodir -%patch4 -p1 -b .gcc4 -%patch5 -p1 -b .64bit + +[ -f configure -a -f include/config.h ] || make %build @@ -87,6 +86,7 @@ install -m755 %{SOURCE10} ./etags export PATH=/sbin:`pwd`:$PATH %configure \ + --disable-encap \ --disable-dumpdata \ --disable-optimize \ --disable-static \ @@ -107,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT make install prefix=$RPM_BUILD_ROOT%{_prefix} # app img -install -p -m644 -D %{SOURCE1} \ +install -p -m644 -D %{SOURCE10} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -115,7 +115,7 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --add-category "X-Fedora" \ - %{SOURCE2} + %{SOURCE11} ## Unpackaged files @@ -155,10 +155,13 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog -* Mon Jul 10 2006 Rex Dieter 0.9.8-0.6.cvs20060327 +* Wed Jul 12 2006 Rex Dieter 0.9.10-0.2.20060710svn +- 0.9.10 + +-* Mon Jul 10 2006 Rex Dieter 0.9.8-0.6.cvs20060327 - BR: ncurses-devel -* Mon Jul 10 2006 Rex Dieter 0.9.8-0.5.cvs20060327 - -emacs subpkg lives again * Fri May 05 2006 Rex Dieter 0.9.8-0.4.cvs20060327 diff --git a/sources b/sources index 858165f..d888704 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b215fc27d49332879d0641cbcf5cba55 M2-0.9.8-cvs20060327.tar.bz2 +8bd1c3c221a68331386b8d3af2f96241 Macaulay2-0.9.10-20060710svn.tar.bz2