rpms/plplot/devel plplot.spec,1.69,1.70

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14925

Modified Files:
	plplot.spec 
Log Message:
* Fri Mar 27 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-4
- Enable ada on ppc64 (resolves bug#241233)
- freefont is now gnu-free-fonts-{mono,sans,serif}



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- plplot.spec	27 Feb 2009 19:43:40 -0000	1.69
+++ plplot.spec	27 Mar 2009 20:47:17 -0000	1.70
@@ -10,7 +10,7 @@
 
 Name:           plplot
 Version:        5.9.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -27,13 +27,7 @@
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
 BuildRequires:  gcc-gfortran
-# Ada is not available on ppc64 and not working on x86_64
-%ifnarch ppc64
 BuildRequires:  gcc-gnat
-%define build_ada -DENABLE_ada:BOOL=ON -DHAVE_ADA_2007:BOOL=ON
-%else
-%define build_ada %{nil}
-%endif
 %if %{with octave}
 BuildRequires:  octave-devel
 %define build_octave %{nil}
@@ -49,7 +43,9 @@
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
 BuildRequires:  gnome-python2-canvas, gnome-python2-gnome
 BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
-BuildRequires:  freefont
+BuildRequires:  gnu-free-fonts-mono
+BuildRequires:  gnu-free-fonts-sans
+BuildRequires:  gnu-free-fonts-serif
 %if %{with pdl}
 BuildRequires:  perl(PDL::Graphics::PLplot)
 %endif
@@ -63,7 +59,9 @@
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Requires:       freefont
+Requires:       gnu-free-fonts-mono
+Requires:       gnu-free-fonts-sans
+Requires:       gnu-free-fonts-serif
 Requires:       numpy
 
 
@@ -281,7 +279,8 @@
 %cmake .. \
 	-DCMAKE_SKIP_RPATH:BOOL=OFF \
 	-DCMAKE_INSTALL_RPATH:PATH="" \
-	%{build_ada} \
+        -DENABLE_ada:BOOL=ON \
+        -DHAVE_ADA_2007:BOOL=ON
 	-DENABLE_d:BOOL=ON \
 	-DENABLE_itcl:BOOL=ON \
 	-DENABLE_itk:BOOL=ON \
@@ -292,7 +291,7 @@
 	-DENABLE_pygcw:BOOL=ON \
 	-DENABLE_tk:BOOL=ON \
 	-DHAVE_PTHREAD:BOOL=ON \
-	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
+	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
 	-DPLD_aqt:BOOL=ON \
 	-DPLD_conex:BOOL=ON \
 	-DPLD_dg300:BOOL=ON \
@@ -495,7 +494,6 @@
 %{_datadir}/plplot%{version}/examples/test_f95.sh
 %{_mandir}/man3/pl*.3*
 
-%ifnarch ppc64
 %files ada
 %defattr(-,root,root,-)
 %{_libdir}/libplplotadad.so.*
@@ -512,7 +510,6 @@
 #%{_datadir}/ada/adainclude/plplotadad/
 %{_datadir}/plplot%{version}/examples/ada/
 %{_datadir}/plplot%{version}/examples/test_ada.sh
-%endif
 
 %files gnome
 %defattr(-,root,root,-)
@@ -607,6 +604,10 @@
 
 
 %changelog
+* Fri Mar 27 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-4
+- Enable ada on ppc64 (resolves bug#241233)
+- freefont is now gnu-free-fonts-{mono,sans,serif}
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild