rpms/plplot/devel plplot.spec,1.73,1.74

[Orion Poplawski]

Author: orion

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

Modified Files:
	plplot.spec 
Log Message:
* Thu Apr 16 2009 Orion Poplawski <orion at cora.nwra.com>
- Only disable ocaml support on sparc64, s390, s390x



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- plplot.spec	16 Apr 2009 09:26:12 -0000	1.73
+++ plplot.spec	20 Apr 2009 17:36:27 -0000	1.74
@@ -24,7 +24,6 @@
 Patch5:         plplot-5.9.2-test.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
 BuildRequires:  gcc-gfortran
@@ -56,7 +55,9 @@
 %if %{with doc}
 BuildRequires:  texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
 %endif
+%ifnarch sparc64 s390 s390x
 BuildRequires:  ocaml, ocaml-findlib, ocaml-camlidl-devel
+%endif
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -173,6 +174,7 @@
 %{summary}.
 
 
+%ifnarch sparc64 s390 s390x
 %package        ocaml
 Summary:        Functions for scientific plotting with OCaml
 Group:          Development/Libraries
@@ -194,6 +196,7 @@
 
 %description    ocaml-devel
 %{summary}.
+%endif
 
 
 %if %{with octave}
@@ -535,6 +538,7 @@
 %{_datadir}/plplot%{version}/examples/java/
 %{_datadir}/plplot%{version}/examples/test_java.sh
 
+%ifnarch sparc64 s390 s390x
 %files ocaml
 %defattr(-,root,root,-)
 %dir %{_libdir}/ocaml/plplot/
@@ -550,6 +554,7 @@
 %{_libdir}/pkgconfig/plplotd-ocaml.pc
 %{_libdir}/ocaml/plplot/*.a
 %{_libdir}/ocaml/plplot/*.cmxa
+%endif
 
 %if %{with octave}
 %files octave
@@ -605,6 +610,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Orion Poplawski <orion at cora.nwra.com>
+- Only disable ocaml support on sparc64, s390, s390x
+
 * Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
 - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
   (added sparc64 per request from the sparc maintainer)