rpms/LabPlot/F-11 LabPlot.spec,1.15,1.16

[Karsten Hopp]

Author: karsten

Update of /cvs/extras/rpms/LabPlot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12330

Modified Files:
	LabPlot.spec 
Log Message:
- texvc isn't build anymore as the one from X is used
- don't require ocaml on s390(x)



Index: LabPlot.spec
===================================================================
RCS file: /cvs/extras/rpms/LabPlot/F-11/LabPlot.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- LabPlot.spec	23 Feb 2009 21:55:35 -0000	1.15
+++ LabPlot.spec	17 Jun 2009 12:14:46 -0000	1.16
@@ -1,6 +1,6 @@
 Name:              LabPlot
 Version:           1.6.0.2
-Release:           4%{?dist}
+Release:           4%{?dist}.1
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -14,7 +14,10 @@ Patch2:            LabPlot-20080225.patc
 
 BuildRequires:     kdelibs3-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
 BuildRequires:     gsl-devel ImageMagick-c++-devel fftw-devel jasper-devel qwtplot3d-devel
-BuildRequires:     pstoedit libtool qt-qsa-devel gettext htmldoc audiofile-devel ocaml
+BuildRequires:     pstoedit libtool qt-qsa-devel gettext htmldoc audiofile-devel 
+%ifnarch s390 s390x
+BuildRequires:     ocaml
+%endif
 BuildRequires:     liborigin-devel qhull-devel
 
 ExcludeArch:       ppc64
@@ -290,7 +293,7 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man1/labplot.*
 %{_bindir}/%{name}
 %{_bindir}/labplot
-%{_bindir}/texvc
+#{_bindir}/texvc
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
 %{_datadir}/icons/??color/??x??/apps/%{name}.png
@@ -353,6 +356,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %Changelog
+* Wed Jun 17 2009 Karsten Hopp <karsten at redhat.com> 1.6.0.2-4.1
+- texvc isn't build anymore as the one from X is used
+- don't require ocaml on s390(x)
+
 * Sun Nov 16 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.2-3
 - handle libLabPlotnetCDF.so* on F-8 and F-9