rpms/Macaulay2/devel Macaulay2-1.1-DESTDIR.patch, NONE, 1.1 Macaulay2-1.1-gcc43.patch, NONE, 1.1 Macaulay2-1.1-optflags.patch, NONE, 1.1 Macaulay2-1.1-prefix.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 Macaulay2.spec, 1.38, 1.39 sources, 1.8, 1.9 Macaulay2-0.9.10-cout.patch, 1.1, NONE Macaulay2-0.9.10-gcc41.patch, 1.2, NONE Macaulay2-0.9.8-optflags.patch, 1.1, NONE Macaulay2-0.9.95-DESTDIR.patch, 1.1, NONE Macaulay2-0.9.95-cflags.patch, 1.1, NONE

Wed Mar 12 18:24:40 UTC 2008

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10126

Modified Files:
	.cvsignore Macaulay2.spec sources 
Added Files:
	Macaulay2-1.1-DESTDIR.patch Macaulay2-1.1-gcc43.patch 
	Macaulay2-1.1-optflags.patch Macaulay2-1.1-prefix.patch 
Removed 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-cflags.patch 
Log Message:
first try at Macaulay2-1.1


Macaulay2-1.1-DESTDIR.patch:

--- NEW FILE Macaulay2-1.1-DESTDIR.patch ---
diff -up Macaulay2-1.1/libraries/Makefile.in.DESTDIR Macaulay2-1.1/libraries/Makefile.in
--- Macaulay2-1.1/libraries/Makefile.in.DESTDIR	2007-08-29 22:37:59.000000000 -0500
+++ Macaulay2-1.1/libraries/Makefile.in	2008-03-12 12:49:09.000000000 -0500
@@ -6,8 +6,8 @@ distclean :: clean
 distclean clean :: Makefile.library
 	@ set -e ; for p in @LIBLIST@ libtool ; do (set -ex ; $(MAKE) -C $$p $@) || false ; done 
 install :
-	@INSTALL@ -d @encapdir@/@librariesdirtail@/lib
-	tar cf - --exclude="*.a" --exclude="*.old" -C final at FINALPREFIX@/@librariesdirtail@/lib . | tar xf - -C @encapdir@/@librariesdirtail@/lib
+#	@INSTALL@ -d @encapdir@/@librariesdirtail@/lib
+#	tar cf - --exclude="*.a" --exclude="*.old" -C final at FINALPREFIX@/@librariesdirtail@/lib . | tar xf - -C @encapdir@/@librariesdirtail@/lib
 Makefile         : Makefile.in         ; cd .. && ./config.status libraries/Makefile
 Makefile.library : Makefile.library.in ; cd .. && ./config.status libraries/Makefile.library
 clean :: ; rm -rf final
diff -up Macaulay2-1.1/libraries/Makefile.library.in.DESTDIR Macaulay2-1.1/libraries/Makefile.library.in
--- Macaulay2-1.1/libraries/Makefile.library.in.DESTDIR	2008-02-07 23:00:00.000000000 -0600
+++ Macaulay2-1.1/libraries/Makefile.library.in	2008-03-12 12:45:47.000000000 -0500
@@ -9,7 +9,7 @@ LIBNAME = $(shell basename `pwd`)
 TARDIR ?= $(LIBNAME)-$(VERSION)
 TARFILE ?= $(LIBNAME)-$(VERSION).tar.gz
 
-LIBRARIESDIR = $(PREFIX)/@librariesdirtail@
+LIBRARIESDIR = $(DESTDIR)$(PREFIX)/@librariesdirtail@
 FINALLIBRARIESDIR = @FINALPREFIX@/@librariesdirtail@
 
 CPPFLAGS := -I$(LIBRARIESDIR)/include $(CPPFLAGS)
diff -up Macaulay2-1.1/include/config.Makefile.in.DESTDIR Macaulay2-1.1/include/config.Makefile.in
--- Macaulay2-1.1/include/config.Makefile.in.DESTDIR	2008-02-07 23:00:00.000000000 -0600
+++ Macaulay2-1.1/include/config.Makefile.in	2008-03-12 12:42:17.000000000 -0500
@@ -34,11 +34,11 @@ LDFLAGS = @LDFLAGS@
 
 ### Here we set the make-variables that configure uses as make-variables inside configure-variables.
 # The user should override only this one:
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
 # We assume relative positions of files within the tree are known to the configure script.
 # Thus the user should not override these on the "make" command line, but may
 # override them on the "configure" command line instead:
-exec_prefix = @exec_prefix@
+exec_prefix = $(DESTDIR)@exec_prefix@
 datarootdir = @datarootdir@
 docdir = @docdir@
 INSTALL = @INSTALL@

Macaulay2-1.1-gcc43.patch:

--- NEW FILE Macaulay2-1.1-gcc43.patch ---
diff -up Macaulay2-1.1/Macaulay2/e/overflow-test.cpp.gcc43 Macaulay2-1.1/Macaulay2/e/overflow-test.cpp
--- Macaulay2-1.1/Macaulay2/e/overflow-test.cpp.gcc43	2007-01-10 14:51:12.000000000 -0600
+++ Macaulay2-1.1/Macaulay2/e/overflow-test.cpp	2008-03-12 12:24:13.000000000 -0500
@@ -2,6 +2,8 @@
 #define inner 5000
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "overflow.hpp"
 #include "assert.h"
 

Macaulay2-1.1-optflags.patch:

--- NEW FILE Macaulay2-1.1-optflags.patch ---
diff -up Macaulay2-1.1/configure.ac.optflags Macaulay2-1.1/configure.ac
--- Macaulay2-1.1/configure.ac.optflags	2008-03-11 15:02:14.000000000 -0500
+++ Macaulay2-1.1/configure.ac	2008-03-11 15:05:03.000000000 -0500
@@ -806,8 +806,8 @@ else M2_CPPFLAGS="$M2_CPPFLAGS -DNDEBUG"
 fi
 
 if test "$OPTIMIZE" = yes
-then CFLAGS="$CFLAGS -O3"
-     CXXFLAGS="$CXXFLAGS -O3"
+then CFLAGS="-O3 $CFLAGS"
+     CXXFLAGS="-O3 $CXXFLAGS"
 else CFLAGS="$CFLAGS -O0 -fno-inline"
      CXXFLAGS="$CXXFLAGS -O0 -fno-inline"
 fi

Macaulay2-1.1-prefix.patch:

--- NEW FILE Macaulay2-1.1-prefix.patch ---
diff -up Macaulay2-1.1/configure.ac.prefix Macaulay2-1.1/configure.ac
--- Macaulay2-1.1/configure.ac.prefix	2008-02-15 09:18:15.000000000 -0600
+++ Macaulay2-1.1/configure.ac	2008-03-11 14:51:08.000000000 -0500
@@ -892,7 +892,7 @@ do eval w=\$$i ; eval v="$w" ; eval v="$
    case $v in
      "$prefix" | "$prefix"/) eval ${i}tail="$prefix" ;;
      "$prefix"/*) eval ${i}tail=`echo $v | sed "s,^$prefix/,,"` ;; # let's just hope $prefix contains no comma
-     *) AC_MSG_ERROR(expected "$i" value "$w" to start with "prefix" value "$prefix") ;;
+     *) AC_MSG_NOTICE(expected "$i" value "$w" to start with "prefix" value "$prefix") ;;
    esac
 done
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Dec 2007 03:08:42 -0000	1.8
+++ .cvsignore	12 Mar 2008 18:23:58 -0000	1.9
@@ -2,3 +2,4 @@
 Macaulay2.png
 Macaulay2-0.9.20-20060808svn.tar.bz2
 Macaulay2-0.9.95-src.tar.gz
+Macaulay2-1.1-src.tar.gz


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Macaulay2.spec	19 Feb 2008 21:07:43 -0000	1.38
+++ Macaulay2.spec	12 Mar 2008 18:23:58 -0000	1.39
@@ -6,13 +6,13 @@
  
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
-Version: 0.9.95
-Release: 10%{?dist}
+Version: 1.1 
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-Source0: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}-src.tar.gz
+Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/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)
@@ -23,15 +23,15 @@
 Source11: Macaulay2.desktop
 Source20: etags.sh
 
-Patch0: Macaulay2-0.9.8-optflags.patch
+Patch0: Macaulay2-1.1-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
+Patch3: Macaulay2-1.1-DESTDIR.patch
+Patch4: Macaulay2-1.1-gcc43.patch
 Patch5: Macaulay2-0.9.95-gc7.patch
-Patch6: Macaulay2-0.9.95-cflags.patch
+Patch7:  Macaulay2-1.1-prefix.patch
 Patch201739: Macaulay2-0.9.95-bz201739.patch
 
+
 BuildRequires: byacc
 BuildRequires: desktop-file-utils
 # etags
@@ -40,17 +40,18 @@
 BuildRequires: gc-devel 
 BuildRequires: gdbm-devel
 BuildRequires: info
-BuildRequires: ntl-devel
+BuildRequires: ntl-devel >= 5.4.1
 BuildRequires: factory-devel
 BuildRequires: libfac-devel
-BuildRequires: lapack
+BuildRequires: blas lapack
 %if 0%{?fedora} > 3 || 0%{?rhel} > 4
-BuildRequires: lapack-devel
+BuildRequires: blas-devel lapack-devel
 %endif
+BuildRequires: mpfr-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
 
-BuildRequires: automake pkgconfig
+BuildRequires: autoconf
 
 Obsoletes: Macaulay2-doc < %{version}-%{release} 
 Provides:  Macaulay2-doc = %{version}-%{release}
@@ -77,16 +78,11 @@
 
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .xdg_open
-%patch2 -p1 -b .cout
 %patch3 -p1 -b .DESTDIR
-%patch4 -p1 -b .gcc41
-%patch5 -p1 -b .gc7
-%patch6 -p1 -b .cflags
+%patch4 -p1 -b .gcc43
+%patch7 -p1 -b .prefix
 %patch201739 -p1 -b .bz201739
 
-aclocal
-autoconf
-
 [ -f configure -a -f include/config.h ] || make 
 
 
@@ -101,10 +97,10 @@
 %configure  \
   --disable-encap \
   --disable-dumpdata \
-  --disable-optimize \
   --disable-static \
-  --disable-strip \
-  --with-lapacklibs="-llapack"
+  --disable-strip
+
+#  --with-lapacklibs="-llapack"
 
 # Not smp-safe
 make 
@@ -182,7 +178,6 @@
 %{_datadir}/Macaulay2/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
-# FIXME
 %{_docdir}/Macaulay2/
 %{_infodir}/*
 %{_mandir}/man1/*
@@ -191,6 +186,9 @@
 
 
 %changelog
+* Tue Mar 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1-1
+- Macaulay2-1.1
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.95-10
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 Dec 2007 03:08:42 -0000	1.8
+++ sources	12 Mar 2008 18:23:58 -0000	1.9
@@ -1,2 +1,2 @@
 cbd99341ddfbed3f87dfd062e4673937  Macaulay2.png
-dbe13387812577b0abfdfa6c54eccecc  Macaulay2-0.9.95-src.tar.gz
+2e68a1514a84a04e6cc848285fc76479  Macaulay2-1.1-src.tar.gz


--- Macaulay2-0.9.10-cout.patch DELETED ---


--- Macaulay2-0.9.10-gcc41.patch DELETED ---


--- Macaulay2-0.9.8-optflags.patch DELETED ---


--- Macaulay2-0.9.95-DESTDIR.patch DELETED ---


--- Macaulay2-0.9.95-cflags.patch DELETED ---


