rpms/Macaulay2/F-13 Macaulay2.spec,1.56,1.57

[tremble]

Author: tremble

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

Modified Files:
	Macaulay2.spec 
Log Message:
Wed Mar 10 2010 Mark Chappell <tremble at fedoraproject.org> - 1.3.1-3
Resolve GPLv3/GPLv2 conflict, by using compat-readline5 instead of readline (6+) see bz#511299


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-13/Macaulay2.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- Macaulay2.spec	10 Mar 2010 11:59:36 -0000	1.56
+++ Macaulay2.spec	10 Mar 2010 14:23:08 -0000	1.57
@@ -6,7 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Engineering
@@ -52,7 +52,8 @@ BuildRequires: mpfr-devel
 BuildRequires: mpir-devel
 BuildRequires: ntl-devel >= 5.4.1
 BuildRequires: pari-devel
-BuildRequires: readline-devel ncurses-devel
+BuildRequires: compat-readline5-devel 
+BuildRequires: ncurses-devel
 BuildRequires: time
 BuildRequires: libxml2-devel
 BuildRequires: mpfr-devel
@@ -106,6 +107,8 @@ PATH=/sbin:$(pwd):$PATH; export PATH
 ## configure macro currently broken, probably fixable -- Rex
 CFLAGS="%{optflags}" \
 CXXFLAGS="%{optflags}" \
+CPPFLAGS="-I%{_includedir}/readline5" \
+LDFLAGS="-L%{_libdir}/readline5" \
 ./configure \
   --prefix=%{_prefix} \
   --libdir="\${prefix}/%{_lib}" \
@@ -228,6 +231,9 @@ fi
 
 
 %changelog
+* Wed Mar 10 2010 Mark Chappell <tremble at fedoraproject.org> - 1.3.1-3
+- GPLv3/GPLv2 conflict, use compat-readline5 - bz#511299
+
 * Tue Mar 09 2010 Mark Chappell <tremble at fedoraproject.org> - 1.3.1-2
 - Replace DSO patch with one accepted upstream
 - Completely disable static linking