diff --git a/2.0.1.tar.gz b/2.0.1.tar.gz deleted file mode 100644 index 88bba2d..0000000 Binary files a/2.0.1.tar.gz and /dev/null differ diff --git a/2.1.9.tar.gz b/2.1.9.tar.gz new file mode 100644 index 0000000..4288bcf Binary files /dev/null and b/2.1.9.tar.gz differ diff --git a/Fix-build-error.patch b/Fix-build-error.patch new file mode 100644 index 0000000..a92a0ce --- /dev/null +++ b/Fix-build-error.patch @@ -0,0 +1,51 @@ +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 6b100b0..e1a148e 100644 --- a/morfologik-stemming.spec +++ b/morfologik-stemming.spec @@ -1,15 +1,16 @@ Name: morfologik-stemming -Version: 2.0.1 +Version: 2.1.9 Release: 1 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) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) mvn(org.apache.felix:maven-bundle-plugin) %if 0 # test deps BuildRequires: mvn(com.carrotsearch:junit-benchmarks) mvn(org.hamcrest:hamcrest-core) @@ -29,6 +30,7 @@ This package contains javadoc for %{name}. %prep %setup -q +%patch0 -p1 find . -name "*.class" -print -delete find . -name "*.jar" -print -delete chmod 644 README.txt @@ -43,7 +45,6 @@ done %pom_remove_plugin :maven-javadoc-plugin %pom_xpath_set pom:addClasspath false morfologik-tools %pom_remove_plugin :maven-assembly-plugin morfologik-tools -%pom_change_dep :morfologik-polish ::'${project.version}' morfologik-speller %build %mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 @@ -59,5 +60,8 @@ done %license LICENSE.txt %changelog +* Tue Aug 22 2023 wulei - 2.1.9-1 +- Update to 2.1.9 + * Wed Jul 29 2020 leiju - 2.0.1-1 - Package init