Sun Jan 7 01:07:33 UTC 2007

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19002

Modified Files:
	.cvsignore Macaulay2.desktop Macaulay2.spec sources 
Added Files:
	Macaulay2-0.9.10-cout.patch Macaulay2-0.9.10-gcc41.patch 
	Macaulay2-0.9.8-optflags.patch Macaulay2-0.9.95-DESTDIR.patch 
	Macaulay2-0.9.95-bz201739.patch 
	Macaulay2-0.9.95-xdg_open.patch 
Removed Files:
	Macaulay2-0.9-htmlview.patch Macaulay2-0.9-optimize.patch 
	Macaulay2-0.9.2-gcc3.patch Macaulay2-0.9.2-gcc34.patch 
	Macaulay2-0.9.2-gcc4.patch Macaulay2-0.9.2-static.patch 
Log Message:
* Sat Jan 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-3
- re-enable ppc build (#201739)

* Tue Jan 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-2
- ./configure --disable-strip, for usable -debuginfo (#220893)

* Mon Dec 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.95-1
- Macaulay2-0.9.95

* Wed Nov 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.5.20060808svn
- .desktop Categories: -Application,Scientific,X-Fedora +ConsoleOnly


Macaulay2-0.9.10-cout.patch:

--- NEW FILE Macaulay2-0.9.10-cout.patch ---
--- 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;
 

Macaulay2-0.9.10-gcc41.patch:

--- NEW FILE Macaulay2-0.9.10-gcc41.patch ---
--- Macaulay2-0.9.10/Macaulay2/e/style.hpp.gcc41	2005-08-11 16:42:21.000000000 -0500
+++ Macaulay2-0.9.10/Macaulay2/e/style.hpp	2006-07-12 14:21:39.000000000 -0500
@@ -14,7 +14,8 @@
 
 #define VECTOR(T) std::vector< T, gc_allocator< T > >
 
-extern "C" char newline[];
+// omit def here, already defined in M2types.h -- Rex
+//extern "C" char newline[];
 
 #include "error.h"
 #include "buffer.hpp"
--- Macaulay2-0.9.10/Macaulay2/e/text_io.hpp.gcc41	2006-07-12 14:04:29.000000000 -0500
+++ Macaulay2-0.9.10/Macaulay2/e/text_io.hpp	2006-07-12 14:04:31.000000000 -0500
@@ -12,7 +12,8 @@
 extern int p_parens;
 extern int i_text_io();
 
-extern "C" char newline[];
+// omit def here, already defined in M2types.h -- Rex
+//extern "C" char newline[];
 
 #define wrapping_prefix "   -- "
 
--- Macaulay2-0.9.10/Macaulay2/e/comp.hpp.gcc41	2006-06-26 15:47:58.000000000 -0500
+++ Macaulay2-0.9.10/Macaulay2/e/comp.hpp	2006-07-12 14:42:24.000000000 -0500
@@ -4,7 +4,8 @@
 #define _comp_hpp_
 
 extern char system_interruptedFlag;
-extern int gbTrace;
+//gbTrace defined in engine.h below -- Rex
+//extern int gbTrace;
 
 #include "engine.h"
 /* engine.h includes definitions of the stop conditions

Macaulay2-0.9.8-optflags.patch:

--- NEW FILE Macaulay2-0.9.8-optflags.patch ---
--- Macaulay2-0.9/include/config.Makefile.in_orig	Sun Sep  9 09:55:36 2001
+++ Macaulay2-0.9/include/config.Makefile.in	Mon Oct 29 11:01:53 2001
@@ -110,8 +110,8 @@
 CFLAGS   += -O3 -fexpensive-optimizations
 CXXFLAGS += -O3 -fexpensive-optimizations
 else
-CFLAGS   += -O0
-CXXFLAGS += -O0
+CFLAGS   +=
+CXXFLAGS += 
 endif
 endif
 

Macaulay2-0.9.95-DESTDIR.patch:

--- NEW FILE Macaulay2-0.9.95-DESTDIR.patch ---
--- Macaulay2-0.9.95/include/config.Makefile.in.DESTDIR	2006-12-18 09:17:36.000000000 -0600
+++ Macaulay2-0.9.95/include/config.Makefile.in	2006-12-18 09:42:47.000000000 -0600
@@ -103,8 +103,8 @@
 # this might have to get changed manually, but hopefully not:
 MAINPACKAGE = Core
 
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+prefix = $(DESTDIR)@prefix@
+exec_prefix = $(DESTDIR)@exec_prefix@
 
 ifeq "$(ENCAP)" "yes"
 encapdir = $(prefix)/$(package)
@@ -125,27 +125,11 @@
 # in autoconf >= 2.60, @datadir@ is replaced by ${datarootdir}, so we need to get its value here:
 datarootdir = @datarootdir@
 
-ifeq ($(findstring $(prefix), at infodir@),)
-$(error expected infodir @infodir@ to begin with $(prefix))
-endif
-ifeq ($(findstring $(prefix), at bindir@),)
-$(error expected bindir @bindir@ to begin with $(prefix))
-endif
-ifeq ($(findstring $(prefix), at datadir@),)
-$(error expected datadir @datadir@ to begin with $(prefix))
-endif
-ifeq ($(findstring $(prefix), at libdir@),)
-$(error expected libdir @libdir@ to begin with $(prefix))
-endif
-ifeq ($(findstring $(prefix), at mandir@),)
-$(error expected mandir @mandir@ to begin with $(prefix))
-endif
-
-infoRelDir = $(subst $(prefix)/,, at infodir@)
-binRelDir = $(subst $(prefix)/,, at bindir@)
-dataRelDir = $(subst $(prefix)/,, at datadir@)
-libRelDir = $(subst $(prefix)/,, at libdir@)
-manRelDir = $(subst $(prefix)/,, at mandir@)
+infoRelDir = $(subst $(prefix)/,,$(DESTDIR)@infodir@)
+binRelDir = $(subst $(prefix)/,,$(DESTDIR)@bindir@)
+dataRelDir = $(subst $(prefix)/,,$(DESTDIR)@datadir@)
+libRelDir = $(subst $(prefix)/,,$(DESTDIR)@libdir@)
+manRelDir = $(subst $(prefix)/,,$(DESTDIR)@mandir@)
 man1RelDir = $(manRelDir)/man1
 man3RelDir = $(manRelDir)/man3
 emacsRelDir = $(dataRelDir)/emacs/site-lisp

Macaulay2-0.9.95-bz201739.patch:

--- NEW FILE Macaulay2-0.9.95-bz201739.patch ---
--- Macaulay2-0.9.95/Macaulay2/d/M2lib.c~	2006-10-15 23:22:55.000000000 +0100
+++ Macaulay2-0.9.95/Macaulay2/d/M2lib.c	2006-12-28 12:59:30.000000000 +0000
@@ -368,7 +368,19 @@ char **argv;
 	       personality(oldpersonality | ADDR_NO_RANDOMIZE);
 	       newpersonality = personality(-1);
 	       personality(oldpersonality | ADDR_NO_RANDOMIZE);	/* just in case the previous line sets the personality to -1, which can happen */
-	       if ((newpersonality & ADDR_NO_RANDOMIZE) != 0) return execvp(argv[0],argv);
+	       if ((newpersonality & ADDR_NO_RANDOMIZE) != 0) {
+		       /* Sometimes the personality isn't inherited.
+			  Prevent endless loops by adding --no-personality to
+			  the command line */
+		       char **new_argv = malloc((argc+2) * sizeof(char *));
+		       if (!new_argv) fatal("out of memory");
+
+		       new_argv[0] = argv[0];
+		       new_argv[1] = "--no-personality";
+		       memcpy(&new_argv[2], &argv[1], sizeof(char *) * (argc));
+		       
+		       return execvp(new_argv[0],new_argv);
+	       }
 	  }
 	  else personality(oldpersonality);
      }

Macaulay2-0.9.95-xdg_open.patch:

--- NEW FILE Macaulay2-0.9.95-xdg_open.patch ---
--- M2/Macaulay2/bin/M2-help.htmlview	2005-03-13 20:00:26.000000000 -0600
+++ M2/Macaulay2/bin/M2-help	2006-03-28 08:50:07.000000000 -0600
@@ -1,2 +1,2 @@
 #! /bin/sh
-${WWBROWSER:-firefox} "$HOME/.Macaulay2/index.html"
+${WWBROWSER:-xdg-open} "$HOME/.Macaulay2/index.html"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:15:35 -0000	1.2
+++ .cvsignore	7 Jan 2007 01:07:02 -0000	1.3
@@ -1 +1,3 @@
-Macaulay2-0.9.2-src.tar.gz
+clog
+Macaulay2-0.9.20-20060808svn.tar.bz2
+Macaulay2-0.9.95-src.tar.gz


Index: Macaulay2.desktop
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.desktop	30 Mar 2006 21:15:18 -0000	1.2
+++ Macaulay2.desktop	7 Jan 2007 01:07:02 -0000	1.3
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Macaulay2
 Exec=M2
-Icon=Macaulay2.png
+Icon=Macaulay2
 SwallowTitle=Macaulay2
 Terminal=true
 Type=Application
-Categories=Application;Education;Math;Scientific;
+Categories=ConsoleOnly;Education;Math;
 Encoding=UTF-8


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Macaulay2.spec	10 Apr 2006 15:16:14 -0000	1.14
+++ Macaulay2.spec	7 Jan 2007 01:07:02 -0000	1.15
@@ -1,164 +1,228 @@
-# busted on x86_64 -- Rex
-# define m2home %{_libdir}/%{name}-%{version}
-# Makefiles hardcode "%prefix/lib" instead, ok?  -- Rex
-%define m2home %{_prefix}/lib/%{name}-%{version}
+
+#define beta 20060808svn
+
+%define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
+%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
  
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
-Version: 0.9.2
-Release: 22%{?dist}
+Version: 0.9.95
+Release: 3%{?dist}
+
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
+Source0: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}-src.tar.gz
+#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-optimize.patch
-Patch1: Macaulay2-0.9-htmlview.patch
-Patch2: Macaulay2-0.9.2-static.patch
-Patch3: Macaulay2-0.9.2-gcc3.patch
-Patch4: Macaulay2-0.9.2-gcc34.patch
-Patch5: Macaulay2-0.9.2-gcc4.patch
+Patch0: Macaulay2-0.9.8-optflags.patch
+Patch1: Macaulay2-0.9.95-xdg_open.patch 
+Patch2: Macaulay2-0.9.10-cout.patch
+Patch3: Macaulay2-0.9.95-DESTDIR.patch
+Patch4: Macaulay2-0.9.10-gcc41.patch
+Patch201739: Macaulay2-0.9.95-bz201739.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel
-BuildRequires: factory-devel >= 2.0.5
-BuildRequires: libfac-devel >= 2.0.5
+BuildRequires: ntl-devel
+BuildRequires: factory-devel 
+BuildRequires: libfac-devel 
+BuildRequires: lapack
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
+BuildRequires: lapack-devel
+%endif
 BuildRequires: gdbm-devel
+BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
-#BuildRequires: lapack-devel
-
-Obsoletes: %{name}-emacs < %{version}-%{release}
-Provides:  %{name}-emacs = %{version}-%{release}
+BuildRequires: byacc 
+# /sbin/install-info
+BuildRequires: info
+# etags
+BuildRequires: emacs-common
+Source20: etags.sh
+
+BuildRequires: automake
+
+Obsoletes: Macaulay2-docs < %{version}-%{release} 
+Provides:  Macaulay2-docs = %{version}-%{release}
+Obsoletes: Macaulay2-emacs < %{version}-%{release}
+Provides:  Macaulay2-emacs = %{version}-%{release}
+
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+# M2-help
+Requires: xdg-utils
 
 %description
 Macaulay 2 is a new software system devoted to supporting research in
 algebraic geometry and commutative algebra written by Daniel R. Grayson
 and Michael E. Stillman
 
-%package doc
-Summary: %{name} documentation
-Group: Documentation
-Requires: %{name} = %{version}
-Requires: htmlview
-%description doc
-%{name} documentation.
-
 
 %prep
-%setup -q
+%setup -q 
+
+install -p -m755 %{SOURCE20} ./etags
 
-%patch0 -p1 -b .opt
-%patch1 -p1 -b .htmlview
-%patch2 -p1 -b .static
-# fix gcc3 blocker, some warnings about use of deprecated headers
-%patch3 -p1 -b .gcc3
-# fc3/gcc34 fix
-%patch4 -p1 -b .gcc34
-# fc4/gcc4 fix
-%patch5 -p1 -b .gcc4
+%patch0 -p1 -b .optflags
+%patch1 -p1 -b .xdg_open
+%patch2 -p1 -b .cout
+%patch3 -p1 -b .DESTDIR
+%patch4 -p1 -b .gcc41
+%patch201739 -p1 -b .bz201739
+
+[ -f configure -a -f include/config.h ] || make 
 
 
 %build
 
+# We need /sbin:. in PATH to find install-info,etags
+export PATH=/sbin:`pwd`:$PATH
+
 %configure  \
+  --disable-encap \
   --disable-dumpdata \
-  --disable-optimize 
-
-#TODO: --with-lapacklibs 
+  --disable-optimize \
+  --disable-static \
+  --disable-strip \
+  --with-lapacklibs="-llapack"
 
+# Not smp-safe
 make 
 
 
-%check || :
-# NOTE: util/screen dies on fc5/buildsystem (could not open pty)
-#make check ||:
+%check 
+# util/screen dies on fc5/buildsystem (could not open pty)
+#make -k check ||:
 
 
 %install
-%makeinstall
+rm -rf $RPM_BUILD_ROOT
 
-# Fix locations
-sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2
-sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2-help
-sed -i -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
-
-## emacs files
-install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-cp -alf $RPM_BUILD_ROOT%{m2home}/emacs/*.el \
-        $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # 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
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora \
-  --add-category "X-Fedora" \
-  %{SOURCE2}
-
-## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{m2home}/setup
-# %doc stuff, no need to dup in appdir
-rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
-# created by make check
-find $RPM_BUILD_ROOT%{m2home} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
-# .cvsignore
-find $RPM_BUILD_ROOT%{m2home} -name .cvsignore -exec rm -v {} \;
-# unuseful files outside of build environment
-find  $RPM_BUILD_ROOT%{m2home}/packages -name "Makefile*" -exec rm -v {} \;
+  --vendor="fedora" \
+  %{SOURCE11}
+
+# Make a new home for emacs files
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/Macaulay2/emacs
+mv $RPM_BUILD_ROOT%{emacs_sitelisp}/M2*.el $RPM_BUILD_ROOT%{_datadir}/Macaulay2/emacs/
+ 
+for dir in %{emacs_sitelisp} %{xemacs_sitelisp} ; do
+  install -d -m755 $RPM_BUILD_ROOT$dir
+  pushd $RPM_BUILD_ROOT%{_datadir}/Macaulay2/emacs
+  for file in M2*.el ; do
+    ln -s %{_datadir}/Macaulay2/emacs/$file $RPM_BUILD_ROOT$dir
+    touch $RPM_BUILD_ROOT$dir/`basename $file .el`.elc
+  done
+  popd
+done
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-#preun
-# Handle possibly existing dumpdata
-#rm -f %{m2home}/libexec/Macaulay2-*-data ||:
-
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%triggerin -- emacs-common
+if [ -d %{emacs_sitelisp} ]; then 
+  for file in %{_datadir}/Macaulay2/emacs/M2*.el ; do
+    ln -sf $file %{emacs_sitelisp}/ ||:
+  done
+fi
+
+%triggerin -- xemacs-common
+if [ -d %{xemacs_sitelisp} ]; then
+  for file in %{_datadir}/Macaulay2/emacs/M2*.el ; do
+    ln -sf $file %{xemacs_sitelisp}/ ||:
+  done
+fi
+
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
 
 
 %files
 %defattr(-,root,root,-)
-%doc Macaulay2/README Macaulay2/CHANGES
-%{_bindir}/M2
+%doc Macaulay2/CHANGES Macaulay2/COPYING
+%{_bindir}/*
+%{_datadir}/Macaulay2/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
-%dir %{m2home}
-%{m2home}/cache/
-%{m2home}/libexec/
-%{m2home}/m2/
-%{m2home}/packages/
-# emacs bits
-%{m2home}/emacs/
-%{_datadir}/emacs/site-lisp/
-
-%files doc
-%defattr(-,root,root,-)
-%{_bindir}/M2-help
-%{m2home}/html/
-%{m2home}/tutorial/
+# FIXME
+%{_docdir}/Macaulay2
+%{_infodir}/*
+%{_mandir}/man1/*
+%ghost %{emacs_sitelisp} 
+%ghost %{xemacs_sitelisp}
 
 
 %changelog
+* Sat Jan 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-3
+- re-enable ppc build (#201739)
+
+* Tue Jan 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-2
+- ./configure --disable-strip, for usable -debuginfo (#220893)
+
+* Mon Dec 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.95-1
+- Macaulay2-0.9.95
+
+* Wed Nov 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.5.20060808svn
+- .desktop Categories: -Application,Scientific,X-Fedora +ConsoleOnly
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.4.20060808svn
+- fc6 respin
+
+* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.3.20060808svn
+- ExcludeArch: ppc (bug #201739)
+- %ghost (x)emacs site-lisp bits (using hints from fedora-rpmdevtools)
+
+* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.2.20060808svn
+- 20060808 snapshot
+
+* Mon Jul 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.1.20060724svn
+- 2006-07-15-0.9.20
+
+* Wed Jul 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.10-0.6.20060710svn
+- 0.9.10
+
+-* Mon Jul 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.6.cvs20060327
+- BR: ncurses-devel
+
+* Fri May 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.4.cvs20060327
+- 64bit patch (#188709)
+
+* Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.3.cvs20060327 
+- omit x86_64, for now (#188709)
+
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
+- 0.9.8 (cvs, no tarball yet)
+- drop -doc subpkg (in main now)
+
 * Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
 - fix icon location (#188384)
 
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
-- *really* disable %%check (fails on fc5+ anyway) 
+- really disable %%check (fails on fc5+ anyway) 
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-20
 - .desktop: drop Category=Development


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Dec 2004 16:15:35 -0000	1.2
+++ sources	7 Jan 2007 01:07:02 -0000	1.3
@@ -1 +1 @@
-f2181baccdb9bbe75c4f6ee61f782533  Macaulay2-0.9.2-src.tar.gz
+dbe13387812577b0abfdfa6c54eccecc  Macaulay2-0.9.95-src.tar.gz


--- Macaulay2-0.9-htmlview.patch DELETED ---


--- Macaulay2-0.9-optimize.patch DELETED ---


--- Macaulay2-0.9.2-gcc3.patch DELETED ---


--- Macaulay2-0.9.2-gcc34.patch DELETED ---


--- Macaulay2-0.9.2-gcc4.patch DELETED ---


--- Macaulay2-0.9.2-static.patch DELETED ---


