rpms/Macaulay2/devel Macaulay2.spec,1.42,1.43

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv548

Modified Files:
	Macaulay2.spec 
Log Message:
- re-enable ppc64 (#253847)
- IgnoreExampleErrors=true



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Macaulay2.spec	13 Mar 2008 03:31:28 -0000	1.42
+++ Macaulay2.spec	13 Mar 2008 17:47:55 -0000	1.43
@@ -16,8 +16,9 @@
 #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
@@ -31,8 +32,9 @@
 Patch7:  Macaulay2-1.1-prefix.patch
 Patch201739: Macaulay2-0.9.95-bz201739.patch
 
-
+BuildRequires: autoconf
 BuildRequires: bison
+BuildRequires: blas-devel
 BuildRequires: desktop-file-utils
 # etags
 BuildRequires: emacs-common
@@ -42,16 +44,14 @@
 BuildRequires: gcc-gfortran
 BuildRequires: gdbm-devel
 BuildRequires: info
-BuildRequires: ntl-devel >= 5.4.1
 BuildRequires: factory-devel >= 3.0.3
 BuildRequires: libfac-devel >= 3.0.1
-BuildRequires: blas-devel lapack-devel
+BuildRequires: lapack-devel
 BuildRequires: mpfr-devel
+BuildRequires: ntl-devel >= 5.4.1
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
 
-BuildRequires: autoconf
-
 Obsoletes: Macaulay2-common < %{version}-%{release}
 Provides:  Macaulay2-common = %{version}-%{release}
 Obsoletes: Macaulay2-doc < %{version}-%{release} 
@@ -89,9 +89,6 @@
 
 %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
 
@@ -113,14 +110,16 @@
 %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}
 
@@ -197,6 +196,8 @@
 * 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