$ git diff --patch-with-stat --summary f4c829b1c23b2b2e18d8b6edaa6f1502c15a71da..b524d0e648581382ec6074026597958a53d8a38a
.abf.yml | 2 +-
...3.25.javaDir.patch => libsvm-3.31.javaDir.patch | 18 +++-------
...kageMain.patch => libsvm-3.31.packageMain.patch | 39 +++++++++++-----------
....pythonDir.patch => libsvm-3.31.pythonDir.patch | 17 +++++-----
...3.25.svm-toy.patch => libsvm-3.31.svm-toy.patch | 4 +--
...25.toolsDir.patch => libsvm-3.31.toolsDir.patch | 10 +++---
libsvm.spec | 28 ++++++++--------
7 files changed, 53 insertions(+), 65 deletions(-)
rename libsvm-3.25.javaDir.patch => libsvm-3.31.javaDir.patch (60%)
rename libsvm-3.25.packageMain.patch => libsvm-3.31.packageMain.patch (89%)
rename libsvm-3.25.pythonDir.patch => libsvm-3.31.pythonDir.patch (61%)
rename libsvm-3.25.svm-toy.patch => libsvm-3.31.svm-toy.patch (95%)
rename libsvm-3.25.toolsDir.patch => libsvm-3.31.toolsDir.patch (71%)
diff --git a/.abf.yml b/.abf.yml
index 38b80f0..074dafb 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
sources:
LibSVM-svm-toy-48.png: 2e30ddfda55f2aee56cb000c5c1ea6da4cd379f7
guide.pdf: 7304ee961da7dccb402968bca844c23ff752afda
- libsvm-3.30.tar.gz: ed917bd42bd108bf56a748704c5d7e07e631b359
+ libsvm-3.31.tar.gz: c2e979d98f1ae2af8c660b1b4dfb2620b646c98d
diff --git a/libsvm-3.25.javaDir.patch b/libsvm-3.31.javaDir.patch
similarity index 60%
rename from libsvm-3.25.javaDir.patch
rename to libsvm-3.31.javaDir.patch
index 2ab4122..5340608 100644
--- a/libsvm-3.25.javaDir.patch
+++ b/libsvm-3.31.javaDir.patch
@@ -1,6 +1,5 @@
-diff -up ./java/Makefile.javaDir ./java/Makefile
---- ./java/Makefile
-+++ ./java/Makefile
+--- a/java/Makefile
++++ b/java/Makefile
@@ -4,14 +4,17 @@
libsvm/svm_print_interface.class \
svm_train.class svm_predict.class svm_toy.class svm_scale.class
@@ -8,9 +7,9 @@ diff -up ./java/Makefile.javaDir ./java/Makefile
+JAVA_DOC_DIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
+CLASSPATH = .
#JAVAC = jikes
--JAVAC_FLAGS = -target 1.7 -source 1.7
+-JAVAC_FLAGS = --release 11
-JAVAC = javac
-+JAVAC_FLAGS = -target 1.8 -source 1.8 -classpath ${CLASSPATH}
++JAVAC_FLAGS = --release 11 -classpath ${CLASSPATH}
+JAVAC ?= javac
# JAVAC_FLAGS =
+JAR ?= jar
@@ -44,11 +43,4 @@ diff -up ./java/Makefile.javaDir ./java/Makefile
dist: clean all
rm *.class libsvm/*.class
-diff -up ./java/test_applet.html.javaDir ./java/test_applet.html
---- ./java/test_applet.html.javaDir 2003-07-12 14:07:32.000000000 +1000
-+++ ./java/test_applet.html 2010-11-08 10:59:11.229518442 +1000
-@@ -1 +1,3 @@
--<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
-+<html>
-+<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
-+</html>
+
diff --git a/libsvm-3.25.packageMain.patch b/libsvm-3.31.packageMain.patch
similarity index 89%
rename from libsvm-3.25.packageMain.patch
rename to libsvm-3.31.packageMain.patch
index 8b71010..7dfa122 100644
--- a/libsvm-3.25.packageMain.patch
+++ b/libsvm-3.31.packageMain.patch
@@ -1,7 +1,6 @@
-diff -up ./Makefile.packageMain ./Makefile
---- ./Makefile.packageMain 2013-03-31 17:06:44.000000000 +1000
-+++ ./Makefile 2013-04-13 22:59:43.796601417 +1000
-@@ -1,11 +1,45 @@
+--- a/Makefile.orig
++++ b/Makefile
+@@ -1,7 +1,35 @@
CXX ?= g++
-CFLAGS = -Wall -Wconversion -O3 -fPIC
+CFLAGS = ${RPM_CFLAGS} -Wall -Wconversion -O3 -fPIC
@@ -13,14 +12,10 @@ diff -up ./Makefile.packageMain ./Makefile
+LIBS= -L${DOT_LIBS} -lsvm
+export LIBSVM_VER
+IS_64:=$(shell /bin/uname -i | awk '/64/ {print 64}')
++
+PREFIXDIR?= /usr
+export PREFIXDIR
-
--all: svm-train svm-predict svm-scale
-+LIBDIR?=${PREFIXDIR}/lib${IS_64}
-+export LIBDIR
-
--lib: svm.o
++
+DATADIR?=${PREFIXDIR}/share
+export DATADIR
+
@@ -39,20 +34,23 @@ diff -up ./Makefile.packageMain ./Makefile
+BINDIR_INSTALL:=${DESTDIR}/${BINDIR}
+export BINDIR_INSTALL
+
+ ifeq ($(OS),Darwin)
+ SHARED_LIB_FLAG = -dynamiclib -Wl,-install_name,libsvm.so.$(SHVER)
+ else
+@@ -12,17 +40,88 @@
+ # CFLAGS += -fopenmp
+ # SHARED_LIB_FLAG += -fopenmp
+
+-all: svm-train svm-predict svm-scale
+all: lib svm-train svm-predict svm-scale # svm-python svm-java svm-toy-qt
-+
+
+-lib: svm.o
+- $(CXX) $(SHARED_LIB_FLAG) svm.o -o libsvm.so.$(SHVER)
+lib: libsvm.so.$(SHVER) libsvm.so
-+
+libsvm.so: libsvm.so.$(SHVER)
+ ln -sf libsvm.so.$(SHVER) libsvm.so
-+
+libsvm.so.$(SHVER): svm.o
- if [ "$(OS)" = "Darwin" ]; then \
- SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,libsvm.so.$(SHVER)"; \
- else \
-@@ -14,12 +48,78 @@
- $(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER)
-
++ $(CXX) $(CFLAGS) $(SHARED_LIB_FLAG) svm.o -o libsvm.so.$(SHVER)
svm-predict: svm-predict.c svm.o
- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
+ $(CXX) $(CFLAGS) svm-predict.c $(LIBS) -o svm-predict -lm
@@ -68,6 +66,7 @@ diff -up ./Makefile.packageMain ./Makefile
+ rm -f *~ svm.o svm-train svm-predict svm-scale svm-toy/qt/svm-toy-qt
+ ${MAKE} -C python clean
+ ${MAKE} -C java clean
++
+svm-python:
+ ${MAKE} -C python
+
@@ -132,4 +131,4 @@ diff -up ./Makefile.packageMain ./Makefile
+# rm -f ${BINDIR_INSTALL}/svm-toy-gtk
+ rm -f ${BINDIR_INSTALL}/svm-toy-qt
+
-
++
diff --git a/libsvm-3.25.pythonDir.patch b/libsvm-3.31.pythonDir.patch
similarity index 61%
rename from libsvm-3.25.pythonDir.patch
rename to libsvm-3.31.pythonDir.patch
index ff0991d..f3f70e2 100644
--- a/libsvm-3.25.pythonDir.patch
+++ b/libsvm-3.31.pythonDir.patch
@@ -1,19 +1,18 @@
-diff -up ./python/Makefile.pythonDir ./python/Makefile
---- ./python/Makefile.pythonDir 2011-05-10 09:35:15.000000000 +1000
-+++ ./python/Makefile 2011-11-08 09:49:54.280501207 +1000
-@@ -1,4 +1,20 @@
+--- a/python/Makefile
++++ b/python/Makefile
+@@ -1,4 +1,18 @@
+-all = lib
+PYTHONDIR_NAME ?= python${PYTHON_VERSION}/site-packages/libsvm
-+PYTHONDIR?=${LIBDIR}/${PYTHONDIR_NAME}
-+PYTHONDIR_INSTALL=${DESTDIR}/${PYTHONDIR}
++PYTHONDIR ?= ${LIBDIR}/${PYTHONDIR_NAME}
++PYTHONDIR_INSTALL ?= ${DESTDIR}/${PYTHONDIR}
+SVM_TOOLS:= $(notdir $(wildcard ../tools/*.py))
-+
- all = lib
-lib:
+- make -C .. lib
+all: lib
+
+lib: ../svm.cpp ../svm.h
- make -C .. lib
++ make -C .. lib
+
+install: all
+ mkdir -p ${PYTHONDIR_INSTALL}
diff --git a/libsvm-3.25.svm-toy.patch b/libsvm-3.31.svm-toy.patch
similarity index 95%
rename from libsvm-3.25.svm-toy.patch
rename to libsvm-3.31.svm-toy.patch
index 3b231a5..d307ce4 100644
--- a/libsvm-3.25.svm-toy.patch
+++ b/libsvm-3.31.svm-toy.patch
@@ -1,5 +1,5 @@
---- svm-toy/qt/Makefile
-+++ svm-toy/qt/Makefile
+--- a/svm-toy/qt/Makefile
++++ b/svm-toy/qt/Makefile
@@ -1,19 +1,25 @@
# use ``export QT_SELECT=qt5'' in a command window for using qt5
# may need to adjust the path of header files
diff --git a/libsvm-3.25.toolsDir.patch b/libsvm-3.31.toolsDir.patch
similarity index 71%
rename from libsvm-3.25.toolsDir.patch
rename to libsvm-3.31.toolsDir.patch
index 099f5be..1644ea8 100644
--- a/libsvm-3.25.toolsDir.patch
+++ b/libsvm-3.31.toolsDir.patch
@@ -1,6 +1,5 @@
-diff -up ./tools/easy.py.toolsDir ./tools/easy.py
---- ./tools/easy.py.toolsDir 2013-03-31 17:06:49.000000000 +1000
-+++ ./tools/easy.py 2013-04-13 23:17:53.399526910 +1000
+--- a/tools/easy.py
++++ b/tools/easy.py
@@ -12,10 +12,10 @@
is_win32 = (sys.platform == 'win32')
@@ -17,9 +16,8 @@ diff -up ./tools/easy.py.toolsDir ./tools/easy.py
else:
# example for windows
-diff -up ./tools/grid.py.toolsDir ./tools/grid.py
---- ./tools/grid.py.toolsDir 2013-03-31 17:06:50.000000000 +1000
-+++ ./tools/grid.py 2013-04-13 23:18:53.964522769 +1000
+--- a/tools/grid.py
++++ b/tools/grid.py
@@ -18,7 +18,7 @@
def __init__(self, dataset_pathname, options):
dirname = os.path.dirname(__file__)
diff --git a/libsvm.spec b/libsvm.spec
index 8eb0769..55310cf 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -9,7 +9,7 @@
%global pom_file_version 3.25
%global pom_file_name JPP.%{maven_group_id}-%{name}.pom
%global octpkg %{name}
-%global release_date 2022-08-11
+%global release_date 2023-02-28
%global cpp_std c++17
%{!?_javadir: %global _javadir %{_datadir}/java}
@@ -33,7 +33,7 @@
Summary: A Library for Support Vector Machines
Name: libsvm
-Version: 3.30
+Version: 3.31
Release: 1
License: BSD
URL: https://www.csie.ntu.edu.tw/~cjlin/libsvm/
@@ -50,11 +50,11 @@ Source8: libsvm.CITATION
Source9: libsvm.DESCRIPTION
Source10: %{name}.rpmlintrc
-Patch0: %{name}-3.25.packageMain.patch
-Patch1: %{name}-3.25.pythonDir.patch
-Patch2: %{name}-3.25.javaDir.patch
-Patch3: %{name}-3.25.svm-toy.patch
-Patch4: %{name}-3.25.toolsDir.patch
+Patch0: %{name}-3.31.packageMain.patch
+Patch1: %{name}-3.31.pythonDir.patch
+Patch2: %{name}-3.31.javaDir.patch
+Patch3: %{name}-3.31.svm-toy.patch
+Patch4: %{name}-3.31.toolsDir.patch
%description
LIBSVM is an integrated software for support vector classification,
@@ -163,7 +163,7 @@ Install this package if you want to develop
programs with libsvm in Java.
%files -n java-%{name}
-%doc java/README-Java java/test_applet.html
+%doc java/README-Java
%{_javadir}/%{name}.jar
%endif
@@ -244,7 +244,7 @@ display the derived separating hyperplane.
#---------------------------------------------------------------------------
%prep
-%autosetup -p0 -n %{name}-3.3
+%autosetup -p1
cp %{SOURCE1} ChangeLog
cp %{SOURCE2} .
@@ -330,7 +330,7 @@ mv tools/README tools/README-Tools
ln -s %{name}.so.%{shver} %{buildroot}/%{_libdir}/%{name}.so
%if %{with python}
-%__make install-python DESTDIR=%{buildroot} PYTHON_VERSION="%{pyver}"
+make install-python DESTDIR=%{buildroot} LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}"
install -p -m 755 tools/*.py %{buildroot}%{python3_libsvm_dir}
for p in %{buildroot}%{python3_libsvm_dir}/*.py; do
sed -i.orig -e 's|#!/usr/bin/env python|#!%{python3}|' $p
@@ -341,7 +341,7 @@ done
%endif
%if %{with java}
-%__make install-java DESTDIR=%{buildroot} JAVA_TARGET_DIR="%{buildroot}%{_javadir}"
+make install-java DESTDIR=%{buildroot} JAVA_TARGET_DIR="%{buildroot}%{_javadir}"
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -p -R java/docs/* %{buildroot}%{_javadocdir}/%{name}
%if %{with maven}
@@ -350,11 +350,11 @@ cp -p -R java/docs/* %{buildroot}%{_javadocdir}/%{name}
%endif
%if %{with gtk}
-%__make install-toy-gtk DESTDIR=%{buildroot}
+make install-toy-gtk DESTDIR=%{buildroot}
%endif
%if %{with qt}
-%__make install-toy-qt DESTDIR=%{buildroot}
+make install-toy-qt DESTDIR=%{buildroot}
%endif
%if %{with octave}
@@ -384,7 +384,7 @@ cp %{name}-svm-toy-gtk-48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
cp %{name}-svm-toy-qt-48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
%endif
-# .deskrop
+# .desktop
mkdir -p %{buildroot}/%{_datadir}/applications
%if %{with gtk}
cp %{name}-svm-toy-gtk.desktop %{buildroot}/%{_datadir}/applications