[plplot/el5/master] Ada never really worked, remove attempt to build it
Orion Poplawski
orion at fedoraproject.org
Fri Aug 20 17:20:51 UTC 2010
commit e515b9640ccefcc7d0db7e8d1b078b521dba50f3
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Aug 20 11:20:47 2010 -0600
Ada never really worked, remove attempt to build it
plplot.spec | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index 99f13dc..5ab2f45 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -22,13 +22,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake, libtool-ltdl-devel, swig
BuildRequires: gcc-gfortran
-# Ada is not available on ppc64 and not working on x86_64
-%ifnarch x86_64 ppc ppc64
-BuildRequires: gcc-gnat
-%define build_ada -DENABLE_ada:BOOL=ON
-%else
-%define build_ada %{nil}
-%endif
%if %{with_octave}
BuildRequires: octave-devel
%endif
@@ -205,7 +198,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
export FFLAGS="$RPM_OPT_FLAGS"
%cmake .. \
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
- %{build_ada} \
-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
-DPLD_aqt:BOOL=ON \
-DPLD_conex:BOOL=ON \
@@ -395,9 +387,6 @@ fi
%{_datadir}/plplot%{version}/examples/f77/
%{_datadir}/plplot%{version}/examples/f95/
%{_datadir}/plplot%{version}/examples/Makefile
-%ifnarch x86_64 ppc ppc64
-%{_datadir}/plplot%{version}/examples/test_ada.sh
-%endif
%{_datadir}/plplot%{version}/examples/test_c.sh
%{_datadir}/plplot%{version}/examples/test_cxx.sh
%{_datadir}/plplot%{version}/examples/test_f77.sh
@@ -476,6 +465,7 @@ fi
- Rebase info patch
- Add new patches to handle new cmake 2.6 behavior with wxWidgets
and Fortran modules
+- Ada never really worked, remove attempt to build it
* Mon Aug 6 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3.1
- Revert BR to gnome-python2 for EL
More information about the scm-commits
mailing list