rpms/plplot/devel plplot.spec,1.32,1.33

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	plplot.spec 
Log Message:
Disable Ada interface on ppc64 until available (bug #241233)



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plplot.spec	12 Jul 2007 19:26:38 -0000	1.32
+++ plplot.spec	12 Jul 2007 19:45:47 -0000	1.33
@@ -18,7 +18,14 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
-BuildRequires:  gcc-gfortran, gcc-gnat
+BuildRequires:  gcc-gfortran
+# Ada is not available on ppc64 and not working on x86_64
+%ifnarch x86_64 ppc64
+BuildRequires:  gcc-gnat
+%define build_ada -DENABLE_ada:BOOL=ON
+%else
+%define build_ada %{nil}
+%endif
 BuildRequires:  java-devel, libgcj-devel
 BuildRequires:  freetype-devel, octave-devel, qhull-devel , ncurses-devel
 BuildRequires:  gd-devel, tcl-devel, tk-devel, itcl-devel, itk-devel
@@ -187,7 +194,7 @@
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export FFLAGS="$RPM_OPT_FLAGS"
 %cmake .. \
-	-DENABLE_ada:BOOL=ON \
+	%{build_ada} \
 	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
 	-DPLD_aqt:BOOL=ON \
 	-DPLD_conex:BOOL=ON \
@@ -240,7 +247,7 @@
 cd fedora
 #Hack
 export ITCL_LIBRARY=%{_libdir}/itcl3.3
-ctest
+ctest -V
 
 
 %clean
@@ -377,7 +384,9 @@
 %{_datadir}/plplot%{version}/examples/f77/
 %{_datadir}/plplot%{version}/examples/f95/
 %{_datadir}/plplot%{version}/examples/Makefile
+%ifnarch x86_64 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
@@ -449,6 +458,7 @@
 
 %changelog
 * Thu Jul 12 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3
+- Disable Ada interface on ppc64 until available (bug #241233)
 - Add build_doc conditional to test doc builds
 
 * Mon Apr 16 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-2