diff --git a/.apache-commons-io.metadata b/.apache-commons-io.metadata index ee078d0..f101735 100644 --- a/.apache-commons-io.metadata +++ b/.apache-commons-io.metadata @@ -1 +1 @@ -0a814676ae1fc3e61d15c4aa50b55dc0faf23308 SOURCES/commons-io-2.6-src.tar.gz +b1455bbde0e932d2f50dc2127b0bcf74c530945c SOURCES/commons-io-2.16.1-src.tar.gz diff --git a/.gitignore b/.gitignore index 9918650..d2ee6ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/commons-io-2.6-src.tar.gz +SOURCES/commons-io-2.16.1-src.tar.gz diff --git a/SPECS/apache-commons-io.spec b/SPECS/apache-commons-io.spec index bea01e4..3fd2821 100644 --- a/SPECS/apache-commons-io.spec +++ b/SPECS/apache-commons-io.spec @@ -1,57 +1,190 @@ +%bcond_with bootstrap + Name: apache-commons-io Epoch: 1 -Version: 2.6 -Release: 6%{?dist} +Version: 2.16.1 +Release: 9%{?dist} Summary: Utilities to assist with developing IO functionality -License: ASL 2.0 -URL: http://commons.apache.org/io +License: Apache-2.0 +URL: https://commons.apache.org/io BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz +Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz -BuildRequires: maven-local-openjdk8 -BuildRequires: mvn(junit:junit) +BuildRequires: jurand +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +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) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.mockito:mockito-core) +%endif %description Commons-IO contains utility classes, stream implementations, file filters, and endian classes. It is a library of utilities to assist with developing IO functionality. -%{?module_package} -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep -%setup -q -n commons-io-%{version}-src +%autosetup -p1 -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 +%java_remove_annotations src -s -n DefaultLocale + +%pom_remove_dep com.google.jimfs:jimfs +rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java + %build -%mvn_build +# See "-DcommonsIoVersion" in maven-surefire for the tested version + +# The following tests fail on tmpfs/nfs: +# * PathUtilsDeleteDirectoryTest.testDeleteDirectory1FileSize0OverrideReadOnly:80->testDeleteDirectory1FileSize0:68 » FileSystem +# * PathUtilsDeleteFileTest.testDeleteReadOnlyFileDirectory1FileSize1:114 » FileSystem +# * PathUtilsDeleteFileTest.testSetReadOnlyFileDirectory1FileSize1:134 » FileSystem +# * 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 %mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles +%files -f .mfiles %license LICENSE.txt NOTICE.txt %doc RELEASE-NOTES.txt +%files javadoc -f .mfiles-javadoc + %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1:2.16.1-7 +- Update javapackages test plan to f42 + +* Tue Sep 03 2024 Mikolaj Izdebski - 1:2.16.1-6 +- Use %%autosetup -C + +* Wed Jul 17 2024 Fedora Release Engineering - 1:2.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 17 2024 Marian Koncek - 1:2.16.1-1 +- Update to upstream version 2.16.1 + +* Tue Feb 27 2024 Jiri Vanek - 1:2.13.0-8 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1:2.13.0-7 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1:2.13.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1:2.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 1:2.13.0-4 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 1:2.13.0-3 +- Rebuild + +* Wed Aug 30 2023 Mikolaj Izdebski - 1:2.13.0-2 +- Build with Jurand instead of deprecated javapackages-extra + +* 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 + +* Wed Jan 18 2023 Fedora Release Engineering - 1:2.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1:2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 1:2.11.0-1 +- Update to upstream version 2.11.0 + +* Sat Feb 05 2022 Jiri Vanek - 1:2.8.0-7 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1:2.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1:2.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1:2.8.0-4 +- Bootstrap build +- Non-bootstrap build + +* Wed Feb 3 2021 Mat Booth - 1:2.8.0-3 +- Add patch to fix Files.size() failing when symlink target is non-existant + +* Tue Jan 26 2021 Fedora Release Engineering - 1:2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 16 2020 Fabio Valentini - 1:2.8.0-1 +- Update to version 2.8.0. + +* Fri Sep 18 2020 Marian Koncek - 1:2.8.0-1 +- Update to upstream version 2.8.0 + +* Tue Aug 18 2020 Fabio Valentini - 1:2.7-1 +- Update to version 2.7. + +* Wed Jul 29 2020 Marian Koncek - 1:2.7-1 +- Update to upstream version 2.7 + +* Mon Jul 27 2020 Fedora Release Engineering - 1:2.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1:2.6-9 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jan 28 2020 Fedora Release Engineering - 1:2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 25 2020 Mikolaj Izdebski - 1:2.6-6 - Build with OpenJDK 8 * Tue Nov 05 2019 Mikolaj Izdebski - 1:2.6-5 - Mass rebuild for javapackages-tools 201902 +* Wed Jul 24 2019 Fedora Release Engineering - 1:2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 1:2.6-4 - Mass rebuild for javapackages-tools 201901 +* Thu Feb 07 2019 Mat Booth - 1:2.6-6 +- Rebuild to regenerate OSGi metadata + +* Thu Jan 31 2019 Fedora Release Engineering - 1:2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1:2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1:2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild