From 888cdbfbe62fea2246a840509439a1f4d14ab127 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 11 Nov 2008 01:06:18 +0000 Subject: [PATCH] ppc java fix --- import.log | 1 + libsvm-2.88.patch | 11 +++++------ libsvm.spec | 9 ++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/import.log b/import.log index 6d19672..dda8e06 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ 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-2_fc9:HEAD:libsvm-2.88-2.fc9.src.rpm:1226365469 diff --git a/libsvm-2.88.patch b/libsvm-2.88.patch index 7db64b9..7d31237 100644 --- a/libsvm-2.88.patch +++ b/libsvm-2.88.patch @@ -1,7 +1,7 @@ diff -up ./FAQ.html.orig ./FAQ.html diff -up ./java/Makefile.orig ./java/Makefile --- ./java/Makefile.orig 2007-11-11 22:17:30.000000000 +1000 -+++ ./java/Makefile 2008-11-05 16:59:35.000000000 +1000 ++++ ./java/Makefile 2008-11-11 10:54:50.000000000 +1000 @@ -3,13 +3,22 @@ FILES = libsvm/svm.class libsvm/svm_mode libsvm/svm_parameter.class libsvm/svm_problem.class \ svm_train.class svm_predict.class svm_toy.class svm_scale.class @@ -22,11 +22,10 @@ diff -up ./java/Makefile.orig ./java/Makefile +ifndef JAR +JAR=jar +endif ++ --all: $(FILES) + all: $(FILES) - jar cvf libsvm.jar *.class libsvm/*.class -+ -+all: $(FILES) javadoc + ${JAR} cvf libsvm.jar *.class libsvm/*.class .java.class: @@ -44,8 +43,8 @@ diff -up ./java/Makefile.orig ./java/Makefile + mkdir -p ${JAVA_TARGETDIR} + install -m 644 libsvm.jar ${JAVA_TARGETDIR} + install -m 644 test_applet.html ${JAVA_TARGETDIR} -+ mkdir -p ${JAVA_DOCDIR} -+ cd docs; cp -R * ${JAVA_DOCDIR} ++# mkdir -p ${JAVA_DOCDIR} ++# cd docs; cp -R * ${JAVA_DOCDIR} +uninstall: + rm -fr ${JAVA_TARGETDIR} + rm -fr ${JAVA_DOCDIR} diff --git a/libsvm.spec b/libsvm.spec index a0c4d05..5973f8f 100644 --- a/libsvm.spec +++ b/libsvm.spec @@ -1,6 +1,6 @@ Name: libsvm Version: 2.88 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Library for Support Vector Machines Group: Development/Libraries @@ -58,8 +58,7 @@ programs with libsvm in Python. %package java Summary: Java tools and interfaces for libsvm Group: Development/Libraries -# javadoc in java-1.5.0-gcj-devel-1.5.0.0-18 is bad. -BuildRequires: java-sdk >= 0:1.5.0.0-21 +BuildRequires: java-sdk >= 0:1.5.0 Requires: jre >= 0:1.5.0 Requires: %{name} = %{version}-%{release} @@ -186,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc java/README-Java %{_datadir}/%{name}/java -%{_datadir}/javadoc/%{name}-%{version} +#%{_datadir}/javadoc/%{name}-%{version} %files svm-toy-gtk %defattr(-,root,root,-) @@ -204,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Nov 10 2008 Ding-Yi Chen - 2.88-1 +* Mon Nov 10 2008 Ding-Yi Chen - 2.88-2 - Fix java BuildRequire and Build * Wed Nov 05 2008 Ding-Yi Chen - 2.88-0