diff --git a/.gitignore b/.gitignore index 214c92f..0c67ce6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /commons-io-2.7-src.tar.gz /commons-io-2.8.0-src.tar.gz /commons-io-2.11.0-src.tar.gz +/commons-io-2.13.0-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index a16f4b6..4864965 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -2,8 +2,8 @@ Name: apache-commons-io Epoch: 1 -Version: 2.11.0 -Release: 4%{?dist} +Version: 2.13.0 +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -12,10 +12,11 @@ ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz +BuildRequires: javapackages-extra %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 +BuildRequires: maven-local BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) @@ -32,26 +33,22 @@ to assist with developing IO functionality. %prep %setup -q -n commons-io-%{version}-src + sed -i 's/\r//' *.txt # Run tests in multiple reusable forks to improve test performance sed -i -e /reuseForks/d -e /forkCount/d pom.xml sed -i '//d' pom.xml -%mvn_file : commons-io %{name} +%mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: %pom_remove_dep org.junit-pioneer:junit-pioneer -%pom_remove_dep :junit-bom +%java_remove_annotations src -s -n DefaultLocale + %pom_remove_dep com.google.jimfs:jimfs - -# Test depends on com.google.jimfs:jimfs rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java -# This annotation is part of junitpioneer -sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java -sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java - %build # See "-DcommonsIoVersion" in maven-surefire for the tested version @@ -62,6 +59,7 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea # * PathUtilsDeleteTest.testDeleteDirectory1FileSize0OverrideReadonly:97->testDeleteDirectory1FileSize0:69 » FileSystem # * PathUtilsDeleteTest.testDeleteDirectory1FileSize1OverrideReadOnly:145->testDeleteDirectory1FileSize1:117 » FileSystem +# moditect profile generates module-info.class %mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io %install @@ -72,6 +70,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Wed Aug 09 2023 Marian Koncek - 1:2.13.0-1 +- Update to upstream version 2.13.0 + * Wed Jul 19 2023 Fedora Release Engineering - 1:2.11.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index b54c9cc..caf3ea3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.11.0-src.tar.gz) = e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3 +SHA512 (commons-io-2.13.0-src.tar.gz) = 187df4b73ac20caa28de99381b32f46673ee5a3b519e6804e6cd8ced49412ba89dd6f5cf43e4cfb54c221331cefa1ed20a180d8c9f0e4c361b4b9a2e98b26017