Fix java BuildRequire and Build

import.log

@@ -1 +1,2 @@
 libsvm-2_88-0_fc9:HEAD:libsvm-2.88-0.fc9.src.rpm:1226043285
+libsvm-2_88-1_fc9:HEAD:libsvm-2.88-1.fc9.src.rpm:1226296273

libsvm-2.88.patch

@@ -66,7 +66,7 @@ diff -up ./java/test_applet.html.orig ./java/test_applet.html
 +</html>
 diff -up ./Makefile.orig ./Makefile
 --- ./Makefile.orig	2008-09-15 14:36:48.000000000 +1000
-+++ ./Makefile	2008-11-05 18:18:03.000000000 +1000
++++ ./Makefile	2008-11-10 14:17:06.000000000 +1000
 @@ -1,11 +1,40 @@
  CXX? = g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -102,7 +102,7 @@ diff -up ./Makefile.orig ./Makefile
 +export LIB_INSTDIR
 +
 +
-+all: svm-train svm-predict svm-scale lib svm-python svm-java svm-toy-gtk svm-toy-qt
++all: lib svm-train svm-predict svm-scale svm-python svm-java svm-toy-gtk svm-toy-qt
  
  lib: svm.o
 -	$(CXX) -shared svm.o -o libsvm.so.$(SHVER)

libsvm.spec

@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.88
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -23,6 +23,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 %define javac javac
 %define jar jar
 %define libdir_libsvm %{_libdir}/libsvm
+%{!?qt3-devel: }
 
 
 %description
@@ -57,8 +58,9 @@ programs with libsvm in Python.
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  java-1.6.0-openjdk-devel
+# javadoc in java-1.5.0-gcj-devel-1.5.0.0-18 is bad.
-#Client doesn't necessory use java-1.6.0
+BuildRequires:  java-sdk >= 0:1.5.0.0-21
+Requires: jre >= 0:1.5.0
 Requires:       %{name} = %{version}-%{release}
 
 %description java
@@ -86,13 +88,8 @@ Group:      Development/Libraries
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 
-%if 0%{?fedora} >= 9
-BuildRequires:  qt-devel
-Requires:       qt
-%else
 BuildRequires:  qt4-devel
 Requires:       qt4
-%endif
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-qt
@@ -207,6 +204,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 10 2008 Ding-Yi Chen <dchen@redhat.com> - 2.88-1
+- Fix java BuildRequire and Build
+
 * Wed Nov 05 2008 Ding-Yi Chen <dchen@redhat.com> - 2.88-0
 - Note:
   + SO version now follows upstream, i.e. SHVER=1, as upstream start to build shared library now.