jjames pushed to rpms/libsvm (f38). "Version 3.31."

Notification time stamped 2023-02-28 22:39:32 UTC

From a9060619807333fb768b76bf468c843b3afc0c8d Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com&gt;
Date: Feb 28 2023 22:10:33 +0000
Subject: Version 3.31.


---

diff --git a/libsvm-3.25.pom b/libsvm-3.25.pom
deleted file mode 100644
index 62cead6..0000000
--- a/libsvm-3.25.pom
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>9</version>
-    </parent>
-
-    <groupId>tw.edu.ntu.csie</groupId>
-    <artifactId>libsvm</artifactId>
-    <version>3.25</version>
-
-    <name>libsvm</name>
-    <description>LIBSVM - A Library for Support Vector
Machines</description>
-    <url>https://github.com/cjlin1/libsvm</url>
-
-    <inceptionYear>2014</inceptionYear>
-
-    <licenses>
-        <license>
-            <name>BSD 3-Clause License</name>
-            <url>http://www.csie.ntu.edu.tw/~cjlin/libsvm/COPYRIGHT</url>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:git:[e-mail]:cjlin1/libsvm.git</connection>
-       
<developerConnection>scm:git:[e-mail]:cjlin1/libsvm.git</developerConnection>
-        <url>https://github.com/cjlin1/libsvm</url>
-    </scm>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-           
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <properties>
-        <java.version>8</java.version>
-        <maven.exec.plugin.version>3.0.0</maven.exec.plugin.version>
-        <build.helper.plugin.version>3.0.0</build.helper.plugin.version>
-        <maven-plugin-version>3.8.0</maven-plugin-version>
-        <javadoc.plugin.version>3.2.0</javadoc.plugin.version>
-        <source.plugin.version>3.2.1</source.plugin.version>
-        <nexus.staging.plugin.version>1.6.8</nexus.staging.plugin.version>
-        <gpg.plugin.version>1.6</gpg.plugin.version>
-        <gpg.keyname>91EA7956A2DAD9CE</gpg.keyname>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${maven.exec.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>m4</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>m4</executable>
-                    <arguments>
-                        <argument>java/libsvm/svm.m4</argument>
-                    </arguments>
-                   
<outputFile>target/generated-sources/libsvm/svm.java</outputFile>
-                    <workingDirectory>${project.basedir}</workingDirectory>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>${build.helper.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                               
<source>${project.basedir}/java/libsvm</source>
-                               
<source>${project.basedir}/target/generated-sources/libsvm</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-plugin-version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <showDeprecation>true</showDeprecation>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${javadoc.plugin.version}</version>
-                <configuration>
-                    <!-- workaround for
https://bugs.openjdk.java.net/browse/JDK-8212233 -->
-                    <javaApiLinks>
-                        <property>
-                            <name>foo</name>
-                            <value>bar</value>
-                        </property>
-                    </javaApiLinks>
-                    <links>
-                       
<link>http://docs.oracle.com/javase/8/docs/api/</link>
-                    </links>
-                   
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
-                    <encoding>utf-8</encoding>
-                    <show>public</show>
-                    <detectLinks>false</detectLinks>
-                    <detectOfflineLinks>true</detectOfflineLinks>
-                    <detectJavaApiLink>true</detectJavaApiLink>
-                    <!-- Speeds up the build of the javadocs -->
-                    <quiet>true</quiet>
-                    <use>false</use>
-                    <doclint>none</doclint>
-                    <additionalJOption>-html5</additionalJOption>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>${source.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                            <goal>test-jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>${nexus.staging.plugin.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release-sign-artifacts</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${gpg.plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
diff --git a/libsvm-3.30.pom b/libsvm-3.30.pom
new file mode 100644
index 0000000..8502ac4
--- /dev/null
+++ b/libsvm-3.30.pom
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>9</version>
+    </parent>
+
+    <groupId>tw.edu.ntu.csie</groupId>
+    <artifactId>libsvm</artifactId>
+    <version>3.30</version>
+
+    <name>libsvm</name>
+    <description>LIBSVM - A Library for Support Vector
Machines</description>
+    <url>https://github.com/cjlin1/libsvm</url>
+
+    <inceptionYear>2014</inceptionYear>
+
+    <licenses>
+        <license>
+            <name>BSD 3-Clause License</name>
+            <url>http://www.csie.ntu.edu.tw/~cjlin/libsvm/COPYRIGHT</url>
+        </license>
+    </licenses>
+
+    <scm>
+        <connection>scm:git:[e-mail]:cjlin1/libsvm.git</connection>
+       
<developerConnection>scm:git:[e-mail]:cjlin1/libsvm.git</developerConnection>
+        <url>https://github.com/cjlin1/libsvm</url>
+    </scm>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+           
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <properties>
+        <java.version>8</java.version>
+        <maven.exec.plugin.version>3.0.0</maven.exec.plugin.version>
+        <build.helper.plugin.version>3.0.0</build.helper.plugin.version>
+        <maven-plugin-version>3.8.0</maven-plugin-version>
+        <javadoc.plugin.version>3.2.0</javadoc.plugin.version>
+        <source.plugin.version>3.2.1</source.plugin.version>
+        <nexus.staging.plugin.version>1.6.8</nexus.staging.plugin.version>
+        <gpg.plugin.version>1.6</gpg.plugin.version>
+        <gpg.keyname>91EA7956A2DAD9CE</gpg.keyname>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>${maven.exec.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>m4</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>m4</executable>
+                    <arguments>
+                        <argument>java/libsvm/svm.m4</argument>
+                    </arguments>
+                   
<outputFile>target/generated-sources/libsvm/svm.java</outputFile>
+                    <workingDirectory>${project.basedir}</workingDirectory>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${build.helper.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                               
<source>${project.basedir}/java/libsvm</source>
+                               
<source>${project.basedir}/target/generated-sources/libsvm</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-plugin-version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <showDeprecation>true</showDeprecation>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${javadoc.plugin.version}</version>
+                <configuration>
+                    <!-- workaround for
https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+                    <javaApiLinks>
+                        <property>
+                            <name>foo</name>
+                            <value>bar</value>
+                        </property>
+                    </javaApiLinks>
+                    <links>
+                       
<link>http://docs.oracle.com/javase/8/docs/api/</link>
+                    </links>
+                   
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+                    <encoding>utf-8</encoding>
+                    <show>public</show>
+                    <detectLinks>false</detectLinks>
+                    <detectOfflineLinks>true</detectOfflineLinks>
+                    <detectJavaApiLink>true</detectJavaApiLink>
+                    <!-- Speeds up the build of the javadocs -->
+                    <quiet>true</quiet>
+                    <use>false</use>
+                    <doclint>none</doclint>
+                    <additionalJOption>-html5</additionalJOption>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${source.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                            <goal>test-jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>${nexus.staging.plugin.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${gpg.plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file
diff --git a/libsvm.javaDir.patch b/libsvm.javaDir.patch
index 6fddb76..2a058d1 100644
--- a/libsvm.javaDir.patch
+++ b/libsvm.javaDir.patch
@@ -1,13 +1,13 @@
-diff -up ./java/Makefile.javaDir ./java/Makefile
---- ./java/Makefile.javaDir	2016-12-22 04:58:49.000000000 +1000
-+++ ./java/Makefile	2018-04-17 12:11:53.773004141 +1000
+diff -up java/Makefile.orig java/Makefile
+--- java/Makefile.orig	2023-02-28 01:31:32.000000000 -0700
++++ java/Makefile	2023-02-28 14:44:58.446569758 -0700
 @@ -5,8 +5,8 @@ FILES = libsvm/svm.class libsvm/svm_mode
  		svm_train.class svm_predict.class svm_toy.class svm_scale.class
  
  #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 8
 +JAVAC ?= javac
  # JAVAC_FLAGS =
  export CLASSPATH := .:$(CLASSPATH)
@@ -33,11 +33,3 @@ 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	2016-12-22 04:58:51.000000000 +1000
-+++ ./java/test_applet.html	2018-04-17 11:51:17.927996424 +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.packageMain.patch b/libsvm.packageMain.patch
index 7bfe158..bb39a64 100644
--- a/libsvm.packageMain.patch
+++ b/libsvm.packageMain.patch
@@ -1,7 +1,7 @@
 diff -up Makefile.orig Makefile
---- Makefile.orig	2022-08-10 08:06:19.000000000 -0600
-+++ Makefile	2022-08-12 08:32:32.832261639 -0600
-@@ -1,11 +1,44 @@
+--- Makefile.orig	2023-02-28 01:31:32.000000000 -0700
++++ Makefile	2023-02-28 13:56:21.696052600 -0700
+@@ -1,7 +1,14 @@
  CXX ?= g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
 +CFLAGS = ${RPM_CFLAGS} -Wconversion -fPIC
@@ -14,6 +14,17 @@ diff -up Makefile.orig Makefile
 +IS_64 := $(shell /bin/uname -i | awk '/64/ {print 64}')
 +PREFIXDIR ?= /usr
 +export PREFIXDIR
+ ifeq ($(OS),Darwin)
+ 	SHARED_LIB_FLAG = -dynamiclib -Wl,-install_name,libsvm.so.$(SHVER)
+ else
+@@ -9,20 +16,80 @@ else
+ endif
+ 
+ # Uncomment the following lines to enable parallelization with OpenMP
+-# CFLAGS += -fopenmp
+-# SHARED_LIB_FLAG += -fopenmp
++CFLAGS += -fopenmp
++SHARED_LIB_FLAG += -fopenmp
  
 -all: svm-train svm-predict svm-scale
 +LIBDIR ?= ${PREFIXDIR}/lib${IS_64}
@@ -46,12 +57,7 @@ diff -up Makefile.orig Makefile
 +	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 +47,46 @@ lib: svm.o
- 	$(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER)
- 
+ 	$(CXX) $(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
diff --git a/libsvm.spec b/libsvm.spec
index f2046fc..a0ca890 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -1,12 +1,8 @@
 %global shver 3
-%global tarballver 3.3
-%global libdir_libsvm %{_libdir}/libsvm
-%global python3_libsvm_dir %{python3_sitearch}/libsvm
 %global maven_group_id tw.edu.ntu.csie
-%global pom_file_version 3.25
-%global pom_file_name JPP.%{maven_group_id}-%{name}.pom
+%global pom_file_version 3.30
 %global octpkg %{name}
-%global release_date 2022-08-11
+%global release_date 2023-02-28
 %global cpp_std c++17
 
 %if %{defined rhel}
@@ -24,13 +20,15 @@
 %endif
 
 Name:           libsvm
-Version:        3.30
-Release:        2%{?dist}
+Version:        3.31
+Release:        1%{?dist}
 Summary:        A Library for Support Vector Machines
 
+%global upver   %(tr -d . <<< %{version})
+
 License:        BSD-3-Clause
 URL:            https://www.csie.ntu.edu.tw/~cjlin/libsvm/
-Source0:        https://www.csie.ntu.edu.tw/~cjlin/libsvm/%{name}-%{tarballver}.tar.gz
+Source0:       
https://github.com/cjlin1/libsvm/archive/v%{upver}/%{name}-%{upver}.tar.gz
 Source1:        https://www.csie.ntu.edu.tw/~cjlin/libsvm/log
 Source2:        https://www.csie.ntu.edu.tw/~cjlin/papers/guide/guide.pdf
 Source3:        libsvm-svm-toy-qt.desktop
@@ -42,11 +40,12 @@ Source6:        libsvm.INDEX
 Source7:        libsvm.CITATION
 Source8:        libsvm.DESCRIPTION
 Patch0:         %{name}.packageMain.patch
-Patch2:         %{name}.javaDir.patch
-Patch4:         %{name}.toolsDir.patch
-Patch5:         %{name}.svm-toy-qt5.patch
+Patch1:         %{name}.javaDir.patch
+Patch2:         %{name}.toolsDir.patch
+Patch3:         %{name}.svm-toy-qt5.patch
 # Fix a broken attempt to detect an empty string
-Patch6:         %{name}.matlab.patch
+# https://github.com/cjlin1/libsvm/pull/194
+Patch4:         %{name}.matlab.patch
 
 # This can be removed when F40 reaches EOL
 %if %{without java}
@@ -130,7 +129,7 @@ svm-toy is a libsvm demonstration program which has a qt-GUI to
 display the derived separating hyperplane.
 
 %prep
-%autosetup -p0 -n %{name}-%{tarballver}
+%autosetup -p0 -n %{name}-%{upver}
 cp -p %{SOURCE1} ChangeLog
 cp -p %{SOURCE2} %{SOURCE3} .
 cp -p %{SOURCE4} %{name}-svm-toy-qt-48.png
@@ -141,7 +140,7 @@ cp -p %{SOURCE5} pom.xml
 # org.sonatype.oss.oss-parent is deprecated and slated for removal from Fedora
 %pom_remove_parent
 
-# Update the POM file, which is stuck on version 3.25
+# Update the POM file, which is stuck on version 3.30
 %pom_xpath_set '/pom:project/pom:version' %{version}
 
 %mvn_file %{maven_group_id}:%{name} %{maven_group_id}/%{name}
@@ -154,7 +153,13 @@ rm FAQ.html.orig
 
 %if %{with python}
 # Fix shebangs
-%py3_shebang_fix python/libsvm tools
+%py3_shebang_fix tools
+# Remove useless shebangs
+for p in python/libsvm/{commonutil,svm,svmutil}.py; do
+    sed -i.orig '1,+1d' $p
+    touch -r $p.orig $p
+    rm $p.orig
+done
 %endif
 
 %if %{with python}
@@ -202,14 +207,13 @@ ln -s %{name}.so.%{shver} %{buildroot}%{_libdir}/%{name}.so
 # Python
 cd python
 %pyproject_install
+%pyproject_save_files libsvm
 cd -
 cd tools
 for p in *.py; do
-    install -p -m 755 *.py %{buildroot}%{python3_libsvm_dir}
-    ln -s %{python3_libsvm_dir}/$p %{buildroot}%{_bindir}/svm-$p
+    install -p -m 755 $p %{buildroot}%{_bindir}/svm-$p
 done
 cd -
-chmod 0755 %{buildroot}%{python3_libsvm_dir}/{commonutil,svm,svmutil}.py
 %endif
 
 %if %{with java}
@@ -281,16 +285,14 @@ cp -p README java/README-Java
 %endif
 
 %if %{with python}
-%files -n python3-%{name}
+%files -n python3-%{name} -f %{pyproject_files}
 %doc python/README-Python tools/README-Tools
-%{python3_libsvm_dir}/
-%{python3_sitearch}/libsvm*.dist-info/
 %{_bindir}/svm-*.py
 %endif
 
 %if %{with java}
 %files java -f .mfiles
-%doc java/README-Java java/test_applet.html
+%doc java/README-Java
 %{_javadir}/%{name}.jar
 
 %files javadoc
@@ -304,6 +306,9 @@ cp -p README java/README-Java
 %{_datadir}/applications/*%{name}-svm-toy-qt.desktop
 
 %changelog
+* Tue Feb 28 2023 Jerry James <loganjerry(a)gmail.com&gt; - 3.31-1
+- Version 3.31
+
 * Mon Feb 27 2023 Jerry James <loganjerry(a)gmail.com&gt; - 3.30-2
 - Dynamically generate python BuildRequires
 
diff --git a/libsvm.svm-toy-qt5.patch b/libsvm.svm-toy-qt5.patch
index 15ae15e..4808048 100644
--- a/libsvm.svm-toy-qt5.patch
+++ b/libsvm.svm-toy-qt5.patch
@@ -1,17 +1,18 @@
 diff -up svm-toy/qt/Makefile.orig svm-toy/qt/Makefile
---- svm-toy/qt/Makefile.orig	2022-08-10 08:06:28.000000000 -0600
-+++ svm-toy/qt/Makefile	2022-08-12 08:37:20.299002661 -0600
+--- svm-toy/qt/Makefile.orig	2023-02-28 01:31:32.000000000 -0700
++++ svm-toy/qt/Makefile	2023-02-28 14:19:22.252890728 -0700
 @@ -1,13 +1,14 @@
  # use  ``export QT_SELECT=qt5'' in a command window for using qt5
  # may need to adjust the path of header files
  CXX? = g++
 -INCLUDE = /usr/include/x86_64-linux-gnu/qt5
 -CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtWidgets -I$(INCLUDE)/QtGui
-I$(INCLUDE)/QtCore -fPIC -std=c++11
+-LIB = -lQt5Widgets -lQt5Gui -lQt5Core
+-MOC = /usr/bin/moc
 +INCLUDE = /usr/include/qt5
 +CPP_STD ?= c++11
 +CFLAGS = ${RPM_CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/QtWidgets -I$(INCLUDE)/QtGui
-I$(INCLUDE)/QtCore -fPIC -std=${CPP_STD}
- LIB = -lQt5Widgets -lQt5Gui -lQt5Core
--MOC = /usr/bin/moc
++LIB = -fopenmp -lQt5Widgets -lQt5Gui -lQt5Core
 +MOC ?= /usr/bin/moc-qt5
  
  svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
@@ -27,8 +28,8 @@ diff -up svm-toy/qt/Makefile.orig svm-toy/qt/Makefile
 -	rm -f *~ svm-toy svm-toy.moc ../../svm.o
 +	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
 diff -up svm-toy/qt/svm-toy.cpp.orig svm-toy/qt/svm-toy.cpp
---- svm-toy/qt/svm-toy.cpp.orig	2022-08-10 08:06:28.000000000 -0600
-+++ svm-toy/qt/svm-toy.cpp	2022-08-12 09:22:09.296679615 -0600
+--- svm-toy/qt/svm-toy.cpp.orig	2023-02-28 01:31:32.000000000 -0700
++++ svm-toy/qt/svm-toy.cpp	2023-02-28 14:19:03.158156750 -0700
 @@ -326,12 +326,12 @@ private slots:
  					double x,y;
  					if(sscanf(buf,"%d%*d:%lf%*d:%lf",&v,&x,&y)==3)
diff --git a/sources b/sources
index 8b9389b..323808f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (guide.pdf) =
5e97a7b76ad4217d7987c5c07f0420e780b61b82fb88fe0e6015681fabb5078980b280cec4a0a7208ea225b9fa84de878295039f4513df26f0d404a21812e44c
-SHA512 (libsvm-3.3.tar.gz) =
705cdebffce0d9ea053cf51b2bfd46303d306b7a2c34ee46065f19e1227459fbdbe6fde6e4769935a0c225da831ec137fb9c0c28fbc2efa06724a94bdd76500d
+SHA512 (libsvm-331.tar.gz) =
78d3241fbf0286da077b8e612604feee13946b551888dcd8f47d23b4791f2a1daf516f3871e9a02d1b70cb58e12705603af8ef3c2ff0aac4211423d5053c7083


	https://src.fedoraproject.org/rpms/libsvm/c/a9060619807333fb768b76bf468c8...