rpms/Macaulay2/F-12 .cvsignore, 1.10, 1.11 Macaulay2.spec, 1.54, 1.55 sources, 1.10, 1.11 Macaulay2-1.2-pari.patch, 1.1, NONE Macaulay2-1.2-prefix.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2197

Modified Files:
	.cvsignore Macaulay2.spec sources 
Removed Files:
	Macaulay2-1.2-pari.patch Macaulay2-1.2-prefix.patch 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-7.r8438
- Macaulay-1.2-r8438
- drop pari support (for now)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	13 Feb 2009 21:30:02 -0000	1.10
+++ .cvsignore	20 Oct 2009 23:25:26 -0000	1.11
@@ -1,6 +1,3 @@
 clog
 Macaulay2.png
-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
+Macaulay2-1.2-r8438-src.tar.bz2


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-12/Macaulay2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- Macaulay2.spec	23 Sep 2009 01:02:40 -0000	1.54
+++ Macaulay2.spec	20 Oct 2009 23:25:27 -0000	1.55
@@ -1,5 +1,6 @@
 
 #define pre 20090202svn
+%define pre r8438
 
 %define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
@@ -7,12 +8,12 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 1.2
-Release: 6%{?dist}
+Release: 7.%{pre}%{?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.bz2
+Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}%{?pre:-%{pre}}-src.tar.bz2
 #Source0: Macaulay2-%{version}-%{pre}.tar.bz2
 Source1: Macaulay2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,8 +27,6 @@ Source20: etags.sh
 
 Patch0: Macaulay2-1.1-optflags.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
@@ -47,7 +46,7 @@ BuildRequires: libfac-devel >= 3.1
 BuildRequires: lapack-devel
 BuildRequires: mpfr-devel
 BuildRequires: ntl-devel >= 5.4.1
-BuildRequires: pari-devel
+#BuildRequires: pari-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
 
@@ -72,14 +71,12 @@ and Michael E. Stillman
 
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 install -p -m755 %{SOURCE20} ./etags
 
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .xdg_open
-%patch2 -p1 -b .pari
-#patch7 -p1 -b .prefix
 %patch201739 -p1 -b .bz201739
 
 [ -f configure -a -f include/config.h ] || make 
@@ -211,6 +208,10 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-7.r8438
+- Macaulay-1.2-r8438
+- drop pari support (for now)
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-6
 - fixup/optimize scriplets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	13 Feb 2009 21:30:02 -0000	1.10
+++ sources	20 Oct 2009 23:25:27 -0000	1.11
@@ -1,2 +1,2 @@
 cbd99341ddfbed3f87dfd062e4673937  Macaulay2.png
-e1a84001028f48ed21d6b21f598a7cb4  Macaulay2-1.2-src.tar.bz2
+6fc30e957d209829f90dbcc263bbe5e8  Macaulay2-1.2-r8438-src.tar.bz2


--- Macaulay2-1.2-pari.patch DELETED ---


--- Macaulay2-1.2-prefix.patch DELETED ---