rpms/Macaulay2/devel Macaulay2-1.1-optflags.patch, 1.2, 1.3 Macaulay2-1.2-pari.patch, NONE, 1.1 Macaulay2-1.2-prefix.patch, NONE, 1.1 Macaulay2-1.2-xdg_open.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 Macaulay2-svn_checkout.sh, 1.3, 1.4 Macaulay2.spec, 1.44, 1.45 sources, 1.9, 1.10 Macaulay2-0.9.95-gc7.patch, 1.1, NONE Macaulay2-0.9.95-xdg_open.patch, 1.1, NONE Macaulay2-1.1-DESTDIR.patch, 1.1, NONE Macaulay2-1.1-gcc43.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Fri Feb 13 21:30:02 UTC 2009 

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16947

Modified Files:
	.cvsignore Macaulay2-svn_checkout.sh Macaulay2.spec sources 
Added Files:
	Macaulay2-1.1-optflags.patch Macaulay2-1.2-pari.patch 
	Macaulay2-1.2-prefix.patch Macaulay2-1.2-xdg_open.patch 
Removed Files:
	Macaulay2-0.9.95-gc7.patch Macaulay2-0.9.95-xdg_open.patch 
	Macaulay2-1.1-DESTDIR.patch Macaulay2-1.1-gcc43.patch 
Log Message:
* Fri Feb 13 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2-1
- Macaulay-1.2


Macaulay2-1.1-optflags.patch:

Index: Macaulay2-1.1-optflags.patch
===================================================================
RCS file: Macaulay2-1.1-optflags.patch
diff -N Macaulay2-1.1-optflags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Macaulay2-1.1-optflags.patch	13 Feb 2009 21:30:02 -0000	1.3
@@ -0,0 +1,14 @@
+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.2-pari.patch:

--- NEW FILE Macaulay2-1.2-pari.patch ---
diff -up Macaulay2-1.2/configure.ac.pari Macaulay2-1.2/configure.ac
--- Macaulay2-1.2/configure.ac.pari	2009-02-13 08:10:27.000000000 -0600
+++ Macaulay2-1.2/configure.ac	2009-02-13 09:27:19.000000000 -0600
@@ -1009,9 +1009,11 @@ do case $i in 
 	#    socket: dynamic loading of libraries is used to determine the current way to look up an IP number
 	#  libgcc_s: comes only in dynamic form
 	-lncurses | -lsocket  | -lgcc_s* ) LIBS_DYNAMIC="$LIBS_DYNAMIC $i" ;;
-	# we must link statically with some libraries:
-	#   libpari: provides no version number at run time, and we must ensure it is configured based on gmp
-	-lpari ) LIBS_STATIC="$LIBS_STATIC $i" ;;
+	# but on some systems, libpari is provided only dynamically (fedora), so we link dynamically
+	# and later we'll figure out a run-time test for whether pari is based on gmp
+	# # we must link statically with some libraries:
+	# #   libpari: provides no version number at run time, and we must ensure it is configured based on gmp
+	# -lpari ) LIBS_STATIC="$LIBS_STATIC $i" ;;
 	*) LIBS_STATIC_OR_DYNAMIC="$LIBS_STATIC_OR_DYNAMIC $i" ;;
    esac
 done

Macaulay2-1.2-prefix.patch:

--- NEW FILE Macaulay2-1.2-prefix.patch ---
diff -up Macaulay2-1.2/configure.ac.prefix Macaulay2-1.2/configure.ac
--- Macaulay2-1.2/configure.ac.prefix	2009-02-02 09:50:05.000000000 -0600
+++ Macaulay2-1.2/configure.ac	2009-02-02 09:50:05.000000000 -0600
@@ -1068,7 +1068,7 @@ do eval w=\$$i ; eval v="$w" ; eval v="$
 	   eval  pre_${i}=`echo $v | sed s,"^$prefix","'\\${pre_prefix}'",`
 	   eval      ${i}=`echo $v | sed s,"^$prefix","'\\${prefix}'",`
 	   ;;
-     *) AC_MSG_ERROR([expected "\${$i}" => "$w" to start with "\${prefix}" or with "\${exec_prefix}"]) ;;
+     *) AC_MSG_NOTICE([expected "\${$i}" => "$w" to start with "\${prefix}" or with "\${exec_prefix}"]) ;;
    esac
 done
 prefix=$save_prefix

Macaulay2-1.2-xdg_open.patch:

--- NEW FILE Macaulay2-1.2-xdg_open.patch ---
diff -up Macaulay2-1.2/Macaulay2/m2/html.m2.xdg_open Macaulay2-1.2/Macaulay2/m2/html.m2
--- Macaulay2-1.2/Macaulay2/m2/html.m2.xdg_open	2009-02-10 20:44:04.000000000 -0600
+++ Macaulay2-1.2/Macaulay2/m2/html.m2	2009-02-13 14:53:16.000000000 -0600
@@ -1154,6 +1154,7 @@ chk := ret -> if ret != 0 then (
      error "external command failed"
      )
 browserMethods := hashTable {
+     "xdg-open" => url -> {"xdg-open", url},
      "firefox" => url -> {"firefox", url},
      "open" => url -> {"open", url},
      "netscape" => url -> {"netscape", "-remote",  "openURL(" | url | ")" },


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Mar 2008 18:23:58 -0000	1.9
+++ .cvsignore	13 Feb 2009 21:30:02 -0000	1.10
@@ -3,3 +3,4 @@
 Macaulay2-0.9.20-20060808svn.tar.bz2
 Macaulay2-0.9.95-src.tar.gz
 Macaulay2-1.1-src.tar.gz
+Macaulay2-1.2-src.tar.bz2


Index: Macaulay2-svn_checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2-svn_checkout.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Macaulay2-svn_checkout.sh	8 Aug 2006 15:54:39 -0000	1.3
+++ Macaulay2-svn_checkout.sh	13 Feb 2009 21:30:02 -0000	1.4
@@ -2,17 +2,16 @@
 
 DATE=$(date +%Y%m%d)
 
-VERSION=0.9.20
-BRANCH=2006-07-15
+VERSION=1.2
 
-MODULE="$(basename $0 -svn_checkout.sh)-${VERSION}"
+MODULE="$(basename $0 -svn_checkout.sh)-$VERSION"
 
 set -x
 rm -rf $MODULE
 # app
-svn export  svn://macaulay2.math.uiuc.edu/Macaulay2/stable/$BRANCH-$VERSION $MODULE
+svn export  svn://macaulay2.math.uiuc.edu/Macaulay2/release-branches/$VERSION $MODULE
 
-tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE 
+tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE
 
 
 # cleanup


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Macaulay2.spec	2 Oct 2008 16:32:51 -0000	1.44
+++ Macaulay2.spec	13 Feb 2009 21:30:02 -0000	1.45
@@ -1,35 +1,30 @@
 
-#define beta 20060808svn
+#define pre 20090202svn
 
 %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: 1.1 
-Release: 2%{?dist}
+Version: 1.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}-src.tar.gz
-#Source0: Macaulay2-%{version}-%{beta}.tar.bz2
+Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}-src.tar.bz2
+#Source0: Macaulay2-%{version}-%{pre}.tar.bz2
 Source1: Macaulay2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.redhat.com/253847
-#ExcludeArch: ppc64
-
 Source10: Macaulay2.png
 Source11: Macaulay2.desktop
 Source20: etags.sh
 
 Patch0: Macaulay2-1.1-optflags.patch
-Patch1: Macaulay2-0.9.95-xdg_open.patch 
-Patch3: Macaulay2-1.1-DESTDIR.patch
-Patch4: Macaulay2-1.1-gcc43.patch
-Patch5: Macaulay2-0.9.95-gc7.patch
-Patch7:  Macaulay2-1.1-prefix.patch
+Patch1: Macaulay2-1.2-xdg_open.patch
+Patch2: Macaulay2-1.2-pari.patch
+Patch7:  Macaulay2-1.2-prefix.patch
 Patch201739: Macaulay2-0.9.95-bz201739.patch
 
 BuildRequires: autoconf
@@ -44,11 +39,12 @@
 BuildRequires: gcc-gfortran
 BuildRequires: gdbm-devel
 BuildRequires: info
-BuildRequires: factory-devel >= 3.0.4
-BuildRequires: libfac-devel >= 3.0.4
+BuildRequires: factory-devel >= 3.1.0
+BuildRequires: libfac-devel >= 3.1.0
 BuildRequires: lapack-devel
 BuildRequires: mpfr-devel
 BuildRequires: ntl-devel >= 5.4.1
+BuildRequires: pari-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
 
@@ -79,9 +75,8 @@
 
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .xdg_open
-%patch3 -p1 -b .DESTDIR
-%patch4 -p1 -b .gcc43
-%patch7 -p1 -b .prefix
+%patch2 -p1 -b .pari
+#patch7 -p1 -b .prefix
 %patch201739 -p1 -b .bz201739
 
 [ -f configure -a -f include/config.h ] || make 
@@ -92,12 +87,17 @@
 # We need /sbin:. in PATH to find install-info,etags
 PATH=/sbin:$(pwd):$PATH; export PATH
 
-%configure  \
-  --disable-encap \
+## configure macro currently broken, probably fixable -- Rex
+CFLAGS="%{optflags}" \
+CXXFLAGS="%{optflags}" \
+./configure \
+  --prefix=%{_prefix} \
+  --libdir="\${prefix}/%{_lib}" \
   --disable-dumpdata \
-  --disable-static \
+  --enable-shared \
   --disable-strip \
-  --disable-building
+  --disable-building \
+  --disable-frobby
 
 # Not smp-safe
 make 
@@ -108,50 +108,57 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # FIXME/TODO: a few examples fail on 64bit/mock, mostly harmless, but still...
-make install DESTDIR=$RPM_BUILD_ROOT \
+make install DESTDIR=%{buildroot} \
   IgnoreExampleErrors=true
 
 # app img
 install -p -m644 -D %{SOURCE10} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
+  %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
 desktop-file-install \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   --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/
+mkdir -p %{buildroot}%{_datadir}/Macaulay2/emacs
+mv %{buildroot}%{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
+  install -d -m755 %{buildroot}$dir
+  pushd %{buildroot}%{_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
+    ln -s %{_datadir}/Macaulay2/emacs/$file %{buildroot}$dir
+    touch %{buildroot}$dir/`basename $file .el`.elc
   done
   popd
 done
 
+# unpackaged files
+rm -f %{buildroot}%{_infodir}/dir
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
 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
+for info_file in \
+BGG Benchmark BoijSoederberg Browse Bruns ChainComplexExtras Classic ConwayPolynomials Depth Dmodules EdgeIdeals Elimination FirstPackage FourTiTwo FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LLLBases LexIdeals LocalRings Macaulay2Doc Markov NoetherNormalization Normaliz PackageTemplate Parsing PieriMaps Points Polyhedra Polymake PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurFunctors SchurRings SimpleDoc SimplicialComplexes StatePolytope Style SymmetricPolynomials TangentCone Text gfanInterface \
+; do
   /sbin/install-info --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||:
 done
 
 %postun
 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
+  for info_file in \ 
+BGG Benchmark BoijSoederberg Browse Bruns ChainComplexExtras Classic ConwayPolynomials Depth Dmodules EdgeIdeals Elimination FirstPackage FourTiTwo FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LLLBases LexIdeals LocalRings Macaulay2Doc Markov NoetherNormalization Normaliz PackageTemplate Parsing PieriMaps Points Polyhedra Polymake PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurFunctors SchurRings SimpleDoc SimplicialComplexes StatePolytope Style SymmetricPolynomials TangentCone Text gfanInterface \
+; do
     /sbin/install-info --delete --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||:
   done
 fi
@@ -180,12 +187,12 @@
 %files
 %defattr(-,root,root,-)
 %doc Macaulay2/COPYING Macaulay2/README
-%{_bindir}/*
-%{_datadir}/applications/*.desktop
+%{_bindir}/M2
+%{_datadir}/applications/*Macaulay2.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/Macaulay2/
 %{_docdir}/Macaulay2/
-%{_infodir}/*
+%{_infodir}/*.info*
 %{_libdir}/Macaulay2/
 %{_mandir}/man1/*
 %ghost %{emacs_sitelisp} 
@@ -193,6 +200,9 @@
 
 
 %changelog
+* Fri Feb 13 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2-1
+- Macaulay-1.2
+
 * Thu Oct 02 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1-2
 - respin (factory/libfac)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Mar 2008 18:23:58 -0000	1.9
+++ sources	13 Feb 2009 21:30:02 -0000	1.10
@@ -1,2 +1,2 @@
 cbd99341ddfbed3f87dfd062e4673937  Macaulay2.png
-2e68a1514a84a04e6cc848285fc76479  Macaulay2-1.1-src.tar.gz
+e1a84001028f48ed21d6b21f598a7cb4  Macaulay2-1.2-src.tar.bz2


--- Macaulay2-0.9.95-gc7.patch DELETED ---


--- Macaulay2-0.9.95-xdg_open.patch DELETED ---


--- Macaulay2-1.1-DESTDIR.patch DELETED ---


--- Macaulay2-1.1-gcc43.patch DELETED ---

More information about the fedora-extras-commits mailing list