rpms/Macaulay2/F-8 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.7, 1.8 Macaulay2.spec, 1.35, 1.36 sources, 1.7, 1.8 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

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Sat Mar 15 13:27:55 UTC 2008 

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24907

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:
* Tue Mar 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1-1
- Macaulay2-1.1
- Obsoletes/Provides: Macaulay2-common (upstream compatibility)
- re-enable ppc64 (#253847)
- IgnoreExampleErrors=true


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/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Dec 2006 21:31:52 -0000	1.7
+++ .cvsignore	15 Mar 2008 13:27:15 -0000	1.8
@@ -1,3 +1,5 @@
 clog
+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/F-8/Macaulay2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Macaulay2.spec	22 Aug 2007 12:32:05 -0000	1.35
+++ Macaulay2.spec	15 Mar 2008 13:27:15 -0000	1.36
@@ -6,59 +6,61 @@
  
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
-Version: 0.9.95
-Release: 8%{?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)
+
 # http://bugzilla.redhat.com/253847
-ExcludeArch: ppc64
+#ExcludeArch: ppc64
 
 Source10: Macaulay2.png
 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: autoconf
+BuildRequires: bison
+BuildRequires: blas-devel
 BuildRequires: desktop-file-utils
 # etags
 BuildRequires: emacs-common
+BuildRequires: flex
 BuildRequires: gawk
 BuildRequires: gc-devel 
+BuildRequires: gcc-gfortran
 BuildRequires: gdbm-devel
 BuildRequires: info
-BuildRequires: ntl-devel
-# v3.0.2 is mostly artificial, but added temporarily just to get a consistent
-# build environment (rawhide only) -- Rex
-BuildRequires: factory-devel >= 3.0.2
-BuildRequires: libfac-devel >= 3.0.2
-BuildRequires: lapack
-%if 0%{?fedora} > 3 || 0%{?rhel} > 4
+BuildRequires: factory-devel >= 3.0.3
+BuildRequires: libfac-devel >= 3.0.1
 BuildRequires: lapack-devel
-%endif
+BuildRequires: mpfr-devel
+BuildRequires: ntl-devel >= 5.4.1
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
 
-BuildRequires: automake pkgconfig
-
+Obsoletes: Macaulay2-common < %{version}-%{release}
+Provides:  Macaulay2-common = %{version}-%{release}
 Obsoletes: Macaulay2-doc < %{version}-%{release} 
 Provides:  Macaulay2-doc = %{version}-%{release}
 Obsoletes: Macaulay2-emacs < %{version}-%{release}
 Provides:  Macaulay2-emacs = %{version}-%{release}
 
+Provides:  macaulay2 = %{version}-%{release}
+
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 # M2-help
@@ -77,55 +79,47 @@
 
 %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 
 
 
 %build
 
-# until gc is patched properly
-CPPFLAGS="-I%{_includedir}/gc";export CPPFLAGS
-
 # We need /sbin:. in PATH to find install-info,etags
 PATH=/sbin:$(pwd):$PATH; export PATH
 
 %configure  \
   --disable-encap \
   --disable-dumpdata \
-  --disable-optimize \
   --disable-static \
   --disable-strip \
-  --with-lapacklibs="-llapack"
+  --disable-building
 
 # Not smp-safe
 make 
 
 
 %check 
-# util/screen dies on fc5/buildsystem (could not open pty)
-#make -k check ||:
+make -k check ||:
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+# FIXME/TODO: a few examples fail on 64bit/mock, mostly harmless, but still...
+make install DESTDIR=$RPM_BUILD_ROOT \
+  IgnoreExampleErrors=true
 
 # app img
 install -p -m644 -D %{SOURCE10} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --vendor="fedora" \
   %{SOURCE11}
 
@@ -149,10 +143,18 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+for info_file in Benchmark Browse ChainComplexExtras Classic Depth Dmodules Elimination FirstPackage FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LexIdeals LLLBases Macaulay2Doc Markov NoetherNormalization PackageTemplate Parsing Points PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurRings SimplicialComplexes Style TangentCone ; do
+  /sbin/install-info --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||:
+done
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+  for info_file in Benchmark Browse ChainComplexExtras Classic Depth Dmodules Elimination FirstPackage FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LexIdeals LLLBases Macaulay2Doc Markov NoetherNormalization PackageTemplate Parsing Points PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurRings SimplicialComplexes Style TangentCone ; do
+    /sbin/install-info --delete --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||:
+  done
+fi
 
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then 
@@ -177,20 +179,33 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Macaulay2/CHANGES Macaulay2/COPYING
+%doc Macaulay2/COPYING Macaulay2/README
 %{_bindir}/*
-%{_datadir}/Macaulay2/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
-# FIXME
+%{_datadir}/Macaulay2/
 %{_docdir}/Macaulay2/
 %{_infodir}/*
+%{_libdir}/Macaulay2/
 %{_mandir}/man1/*
 %ghost %{emacs_sitelisp} 
 %ghost %{xemacs_sitelisp}
 
 
 %changelog
+* Tue Mar 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1-1
+- Macaulay2-1.1
+- Obsoletes/Provides: Macaulay2-common (upstream compatibility)
+- re-enable ppc64 (#253847)
+- IgnoreExampleErrors=true
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.95-10
+- Autorebuild for GCC 4.3
+
+* Tue Dec 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-9
+- Provides: macaulay2
+- respin against new(er) factory,libfac,ntl
+
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-8
 - ExcludeArch: ppc64 (#253847)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Dec 2006 21:31:52 -0000	1.7
+++ sources	15 Mar 2008 13:27:15 -0000	1.8
@@ -1 +1,2 @@
-dbe13387812577b0abfdfa6c54eccecc  Macaulay2-0.9.95-src.tar.gz
+cbd99341ddfbed3f87dfd062e4673937  Macaulay2.png
+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 ---

More information about the fedora-extras-commits mailing list