diff --git a/Fix-build-error.patch b/Fix-build-error.patch deleted file mode 100644 index a92a0ce..0000000 --- a/Fix-build-error.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nur a/morfologik-tools/src/main/java/morfologik/tools/CliTool.java b/morfologik-tools/src/main/java/morfologik/tools/CliTool.java ---- a/morfologik-tools/src/main/java/morfologik/tools/CliTool.java 2023-08-23 14:39:58.823450555 +0800 -+++ b/morfologik-tools/src/main/java/morfologik/tools/CliTool.java 2023-08-23 14:43:50.962815645 +0800 -@@ -178,13 +178,13 @@ - private static void helpDisplayCommandOptions(PrintStream pw, String command, JCommander jc) { - StringBuilder sb = new StringBuilder(); - jc = jc.getCommands().get(command); -- jc.getUsageFormatter().usage(sb, ""); -+ jc.usage(sb, ""); - pw.print(sb); - } - - private static void helpDisplayCommandOptions(PrintStream pw, JCommander jc) { - StringBuilder sb = new StringBuilder(); -- jc.getUsageFormatter().usage(sb, ""); -+ jc.usage(sb, ""); - pw.print(sb); - } - } -diff -Nur a/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java b/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java ---- a/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java 2023-08-23 14:39:58.823450555 +0800 -+++ b/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java 2023-08-23 14:52:13.722103640 +0800 -@@ -1,11 +1,11 @@ - package morfologik.tools; - --import com.beust.jcommander.IStringConverter; --import com.beust.jcommander.IStringConverterFactory; -- - import java.nio.file.Path; - import java.nio.file.Paths; - -+import com.beust.jcommander.IStringConverter; -+import com.beust.jcommander.IStringConverterFactory; -+ - class CustomParameterConverters implements IStringConverterFactory { - public static class PathConverter implements IStringConverter { - @Override -@@ -14,10 +14,11 @@ - } - } - -+ @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override -- public Class> getConverter(Class forType) { -+ public Class> getConverter(Class forType) { - if (forType.equals(Path.class)) { -- return PathConverter.class; -+ return (Class) PathConverter.class; - } - return null; - } diff --git a/morfologik-stemming.spec b/morfologik-stemming.spec index e1a148e..383d084 100644 --- a/morfologik-stemming.spec +++ b/morfologik-stemming.spec @@ -1,11 +1,10 @@ Name: morfologik-stemming Version: 2.1.9 -Release: 1 +Release: 2 Summary: Morfologik stemming library License: BSD URL: https://github.com/morfologik/morfologik-stemming Source0: https://github.com/morfologik/morfologik-stemming/archive/%{version}.tar.gz -Patch0: Fix-build-error.patch BuildRequires: maven-local mvn(com.beust:jcommander) mvn(com.carrotsearch:hppc) BuildRequires: mvn(com.google.guava:guava) mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-lang:commons-lang) @@ -29,8 +28,7 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 find . -name "*.class" -print -delete find . -name "*.jar" -print -delete chmod 644 README.txt @@ -60,6 +58,9 @@ done %license LICENSE.txt %changelog +* Fri Sep 22 2023 yaoxin - 2.1.9-2 +- Fix build failure caused by beust-jcommander upgrade to 1.78 + * Tue Aug 22 2023 wulei - 2.1.9-1 - Update to 2.1.9