Compare commits

..

No commits in common. "c9-beta-stream-202201" and "c8-stream-3.6" have entirely different histories.

3 changed files with 10 additions and 96 deletions

View File

@ -1 +1 @@
119842d93a20807c7e1ed7a367dd759c8126b9ee SOURCES/commons-io-2.11.0-src.tar.gz 0a814676ae1fc3e61d15c4aa50b55dc0faf23308 SOURCES/commons-io-2.6-src.tar.gz

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
SOURCES/commons-io-2.6-src.tar.gz

View File

@ -1,33 +1,25 @@
%bcond_with bootstrap
Name: apache-commons-io Name: apache-commons-io
Epoch: 1 Epoch: 1
Version: 2.11.0 Version: 2.6
Release: 2%{?dist} Release: 6%{?dist}
Summary: Utilities to assist with developing IO functionality Summary: Utilities to assist with developing IO functionality
License: ASL 2.0 License: ASL 2.0
URL: https://commons.apache.org/io URL: http://commons.apache.org/io
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap-openjdk8
%else
BuildRequires: maven-local-openjdk8 BuildRequires: maven-local-openjdk8
BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter)
BuildRequires: mvn(org.mockito:mockito-core)
%endif
%description %description
Commons-IO contains utility classes, stream implementations, Commons-IO contains utility classes, stream implementations,
file filters, and endian classes. It is a library of utilities file filters, and endian classes. It is a library of utilities
to assist with developing IO functionality. to assist with developing IO functionality.
%{?module_package}
%{?javadoc_package} %{?javadoc_package}
%prep %prep
@ -36,109 +28,30 @@ sed -i 's/\r//' *.txt
# Run tests in multiple reusable forks to improve test performance # Run tests in multiple reusable forks to improve test performance
sed -i -e /reuseForks/d -e /forkCount/d pom.xml sed -i -e /reuseForks/d -e /forkCount/d pom.xml
sed -i '/<argLine>/d' pom.xml
%mvn_file : commons-io %{name} %mvn_file : commons-io %{name}
%mvn_alias : org.apache.commons: %mvn_alias : org.apache.commons:
%pom_remove_dep org.junit-pioneer:junit-pioneer
%pom_remove_dep :junit-bom
%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 %build
# See "-DcommonsIoVersion" in maven-surefire for the tested version %mvn_build
# 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
%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -n %{?module_prefix}%{name} -f .mfiles
%license LICENSE.txt NOTICE.txt %license LICENSE.txt NOTICE.txt
%doc RELEASE-NOTES.txt %doc RELEASE-NOTES.txt
%changelog %changelog
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.11.0-1
- Update to upstream version 2.11.0
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:2.8.0-7
- Rebuilt for java-17-openjdk as system jdk
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-4
- Bootstrap build
- Non-bootstrap build
* Wed Feb 3 2021 Mat Booth <mat.booth@redhat.com> - 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 <releng@fedoraproject.org> - 1:2.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Oct 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1:2.8.0-1
- Update to version 2.8.0.
* Fri Sep 18 2020 Marian Koncek <mkoncek@redhat.com> - 1:2.8.0-1
- Update to upstream version 2.8.0
* Tue Aug 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1:2.7-1
- Update to version 2.7.
* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 1:2.7-1
- Update to upstream version 2.7
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:2.6-9
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-6 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-6
- Build with OpenJDK 8 - Build with OpenJDK 8
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-5 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-5
- Mass rebuild for javapackages-tools 201902 - Mass rebuild for javapackages-tools 201902
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-4 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-4
- Mass rebuild for javapackages-tools 201901 - Mass rebuild for javapackages-tools 201901
* Thu Feb 07 2019 Mat Booth <mat.booth@redhat.com> - 1:2.6-6
- Rebuild to regenerate OSGi metadata
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-3 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild