[Macaulay2] 1.4-5

[Rex Dieter]

commit 0dc33b2ae6912ac7bf131ffd59f782d8c6d702cb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed May 30 11:31:39 2012 -0500

    1.4-5
    
    - License: GPLv2 or GPLv3 (#821036)
    - pkgconfig-style deps

 Macaulay2.spec |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/Macaulay2.spec b/Macaulay2.spec
index 73dcbae..8abc3ec 100644
--- a/Macaulay2.spec
+++ b/Macaulay2.spec
@@ -8,9 +8,9 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
-License: GPLv2
+License: GPLv2 or GPLv3
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
 # the SVN revision is being used as a unique ID
@@ -47,17 +47,20 @@ Patch8: Macaulay2-1.4-fedora_normaliz27.patch
 
 Patch201739: Macaulay2-1.4-bz201739.patch
 
+BuildRequires: 4ti2
 BuildRequires: autoconf
 BuildRequires: bison
 BuildRequires: blas-devel
+BuildRequires: cddlib-devel cddlib-static
 BuildRequires: desktop-file-utils
 # etags
 BuildRequires: emacs-common
 BuildRequires: flex
 BuildRequires: gawk
-BuildRequires: gc-devel 
 BuildRequires: gcc-gfortran
 BuildRequires: gdbm-devel
+BuildRequires: gfan
+BuildRequires: glpk-devel
 BuildRequires: info
 BuildRequires: factory-static
 BuildRequires: factory-devel >= 3.1
@@ -69,19 +72,14 @@ BuildRequires: mpfr-devel
 BuildRequires: mpir-devel
 BuildRequires: ntl-devel >= 5.4.1
 BuildRequires: pari-devel
-# using compat-readline for GPLv2 compatibility
-BuildRequires: compat-readline5-devel 
-BuildRequires: ncurses-devel
+BuildRequires: pkgconfig(bdw-gc) 
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(ncurses)
+BuildRequires: readline-devel 
 BuildRequires: time
-BuildRequires: libxml2-devel
-BuildRequires: mpfr-devel
-BuildRequires: glpk-devel
-BuildRequires: cddlib-devel cddlib-static
-BuildRequires: gfan
-BuildRequires: 4ti2
 
-Requires: gfan
 Requires: 4ti2
+Requires: gfan
 
 %if 0%{?system_normaliz}
 BuildRequires: normaliz >= 2.7
@@ -272,6 +270,11 @@ fi
 
 
 %changelog
+* Wed May 30 2012 Rex Dieter <rdieter at fedoraproject.org>
+- 1.4-5
+- License: GPLv2 or GPLv3 (#821036)
+- pkgconfig-style deps
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
 - Rebuilt for c++ ABI breakage