rpms/libsvm/devel import.log, 1.1, 1.2 libsvm-2.88.patch, 1.1, 1.2 libsvm.spec, 1.30, 1.31

[Ding-Yi Chen]

Author: dchen

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

Modified Files:
	import.log libsvm-2.88.patch libsvm.spec 
Log Message:
Fix java BuildRequire and Build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Nov 2008 08:00:37 -0000	1.1
+++ import.log	10 Nov 2008 05:51:47 -0000	1.2
@@ -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:

Index: libsvm-2.88.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm-2.88.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsvm-2.88.patch	7 Nov 2008 08:00:37 -0000	1.1
+++ libsvm-2.88.patch	10 Nov 2008 05:51:47 -0000	1.2
@@ -66,7 +66,7 @@
 +</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 @@
 +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)


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libsvm.spec	7 Nov 2008 08:00:37 -0000	1.30
+++ libsvm.spec	10 Nov 2008 05:51:47 -0000	1.31
@@ -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 @@
 %define javac javac
 %define jar jar
 %define libdir_libsvm %{_libdir}/libsvm
+%{!?qt3-devel: }
 
 
 %description
@@ -57,8 +58,9 @@
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  java-1.6.0-openjdk-devel
-#Client doesn't necessory use java-1.6.0
+# javadoc in java-1.5.0-gcj-devel-1.5.0.0-18 is bad.
+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 @@
 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 @@
 
 
 %changelog
+* Mon Nov 10 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-1
+- Fix java BuildRequire and Build
+
 * Wed Nov 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-0
 - Note:
   + SO version now follows upstream, i.e. SHVER=1, as upstream start to build shared library now.