rpms/plplot/EL-4 plplot.spec,1.31,1.32

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/plplot/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11656

Modified Files:
	plplot.spec 
Log Message:
Sync from EL-5



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/EL-4/plplot.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- plplot.spec	16 Apr 2007 17:11:46 -0000	1.31
+++ plplot.spec	3 Aug 2007 01:24:48 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           plplot
 Version:        5.7.3
-Release:        2%{?dist}
+Release:        3%{?dist}.1
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -17,12 +17,19 @@
 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
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
-BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
+BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
 BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
 BuildRequires:  freefont
 %ifarch %{ix86} x86_64
@@ -184,7 +191,7 @@
 export FFLAGS="$RPM_OPT_FLAGS"
 %cmake .. \
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-	-DENABLE_ada:BOOL=ON \
+	%{build_ada} \
 	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
 	-DPLD_aqt:BOOL=ON \
 	-DPLD_conex:BOOL=ON \
@@ -233,7 +240,7 @@
 cd fedora
 #Hack
 export ITCL_LIBRARY=%{_libdir}/itcl3.3
-ctest
+ctest -V
 
 
 %clean
@@ -370,7 +377,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
@@ -441,6 +450,13 @@
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 %changelog
+* Thu Aug  2 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3.1
+- Revert BR to gnome-python2 for EL
+
+* Thu May 24 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3
+- Disable Ada interface on x86_64 until working (bug #241233)
+- Disable Ada interface on ppc64 until available (bug #241233)
+
 * Mon Apr 16 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-2
 - Use cmake macros