diff --git a/joni-2.1.24.zip b/joni-2.1.24.zip deleted file mode 100644 index 0512b759a4289f57d69e887a3d79cf7370e158fc..0000000000000000000000000000000000000000 Binary files a/joni-2.1.24.zip and /dev/null differ diff --git a/joni-2.1.43.tar.gz b/joni-2.1.43.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ff89340c562e06f0cb7b41c157f4f7abd09eb397 Binary files /dev/null and b/joni-2.1.43.tar.gz differ diff --git a/joni.spec b/joni.spec index 10e2baf989b6c4c0f914b200347513a2f4d5532b..54219fd04289c8a7c0bcbd5cbbd6b51f22bd0617 100644 --- a/joni.spec +++ b/joni.spec @@ -1,57 +1,49 @@ -Name: joni -Version: 2.1.24 -Release: 1 -Summary: Java port of Oniguruma regexp library -License: MIT -URL: https://github.com/jruby/%{name} -Source0: https://github.com/jruby/%{name}/archive/%{name}-%{version}.zip -BuildArch: noarch -BuildRequires: java-devel jcodings jpackage-utils junit maven-local maven-compiler-plugin -BuildRequires: maven-jar-plugin maven-surefire-plugin sonatype-oss-parent -BuildRequires: objectweb-asm -Requires: jcodings jpackage-utils objectweb-asm +Name: joni +Version: 2.1.43 +Release: 1 +Summary: Java port of Oniguruma regexp library +License: MIT +URL: https://github.com/jruby/%{name} +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch +Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz +BuildRequires: maven-local +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.jruby.jcodings:jcodings) + %description joni is a port of Oniguruma, a regular expressions library, to java. It is used by jruby. -%package help -Summary: Javadoc for %{name} -Requires: jpackage-utils -%description help -API documentation for %{name}. +%{?javadoc_package} %prep -%autosetup -n %{name}-%{name}-%{version} -p1 - +# -n: base directory name +%autosetup -n %{name}-%{name}-%{version} +# delete precompiled jar and class files find -type f '(' -iname '*.jar' -o -iname '*.class' ')' -print -delete - # Remove pointless parent pom %pom_remove_parent - # Remove wagon extension %pom_xpath_remove 'pom:build/pom:extensions' - # Remove plugins not relevant for downstream RPM builds %pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-source-plugin %build -%mvn_build -j -- -P !release-on-9 - -# Avoid module not found: org.objectweb.asm org.jruby.jcodings -find -name module-info.java -delete -xmvn --batch-mode --offline org.fedoraproject.xmvn:xmvn-mojo:javadoc +%mvn_build -- -Dmaven.compiler.release=8 %install %mvn_install %files -f .mfiles -%doc MANIFEST.MF README.md %license LICENSE - -%files help -f .mfiles-javadoc +%doc README.md %changelog +* Mon Nov 14 2022 hkgy - 2.1.43-1 +- Upgrade to v2.1.43 + * Tue Feb 15 2022 yaoxin - 2.1.24-1 - Upgrade joni to 2.1.24 to resolve compilation failures.