rpms/plplot/devel plplot.spec,1.4,1.5

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	plplot.spec 
Log Message:
- Re-enable java on ppc - should be fixed in upstream rawhide



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plplot.spec	11 Aug 2005 22:23:37 -0000	1.4
+++ plplot.spec	30 Aug 2005 15:53:16 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.5.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -19,12 +19,7 @@
 
 BuildRequires:  autoconf
 BuildRequires:  gcc-gfortran, freetype-devel, octave-devel, qhull-devel
-%ifarch %{ix86} x86_64
 BuildRequires:  java-devel, libgcj-devel
-%define java_config %{nil}
-%else
-%define java_config --disable-java
-%endif
 BuildRequires:  gd-devel, tcl-devel, tk-devel
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
@@ -84,7 +79,6 @@
 %{summary}
 
 
-%ifarch %{ix86} x86_64
 %package        java
 Summary:        Functions for scientific plotting with Java
 Group:          Development/Libraries
@@ -102,7 +96,6 @@
 
 %description    java-devel
 %{summary}
-%endif
 
 
 %package        octave
@@ -147,7 +140,7 @@
 %configure --disable-static --without-rpath --with-pthreads \
            --with-freetype-font-dir=/usr/share/fonts \
            --with-libunicode=no --disable-cgm --disable-linuxvga \
-           --disable-wingcc --disable-aqt --disable-pdl %{java_config}
+           --disable-wingcc --disable-aqt --disable-pdl
 make
 
 
@@ -276,7 +269,6 @@
 %defattr(-,root,root,-)
 %{_libdir}/libplplotgnome2d.so
 
-%ifarch %{ix86} x86_64
 %files java
 %defattr(-,root,root,-)
 %{_libdir}/jni/plplotjavac_wrap.so
@@ -286,7 +278,6 @@
 %defattr(-,root,root,-)
 %{_datadir}/plplot%{version}/examples/java/
 %{_datadir}/plplot%{version}/examples/test_java.sh
-%endif
 
 %files octave
 %defattr(-,root,root,-)
@@ -317,6 +308,9 @@
 %{_datadir}/plplot%{version}/examples/tk/
 
 %changelog
+* Tue Aug 30 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-8
+- Re-enable java on ppc - should be fixed in upstream rawhide
+
 * Thu Aug 11 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-7
 - Breakout java into its own sub-package, don't build on non x86
 - Add patch to fix c test on ppc