Compare commits

..

No commits in common. 'c9' and 'stream-javapackages-tools-202201-msvsphere-9.1.0' have entirely different histories.

@ -1 +1 @@
d82ee085d66826d0bacdb4528080726e2d3caedd SOURCES/commons-io-2.8.0-src.tar.gz 119842d93a20807c7e1ed7a367dd759c8126b9ee SOURCES/commons-io-2.11.0-src.tar.gz

16
.gitignore vendored

@ -1 +1,15 @@
SOURCES/commons-io-2.8.0-src.tar.gz /results_*
/*.src.rpm
/commons-io-1.4-src.tar.gz
/commons-io-2.0-src.tar.gz
/commons-io-2.0.1-src.tar.gz
/commons-io-2.1-src.tar.gz
/commons-io-2.2-src.tar.gz
/commons-io-2.3-src.tar.gz
/commons-io-2.4-src.tar.gz
/commons-io-2.5-src.tar.gz
/commons-io-2.6-src.tar.gz
/commons-io-2.7-src.tar.gz
/commons-io-2.8.0-src.tar.gz
/commons-io-2.11.0-src.tar.gz

@ -1,25 +0,0 @@
From 610065347bbbc8fea366de32e558de4977807e52 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 3 Feb 2021 19:45:13 +0000
Subject: [PATCH] Fix Files.size failing when symlink target is non-existant
---
src/main/java/org/apache/commons/io/file/PathUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java
index d370ef0b..b38a46a0 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -358,7 +358,7 @@ public static PathCounters deleteFile(final Path file, final DeleteOption... opt
}
final PathCounters pathCounts = Counters.longPathCounters();
final boolean exists = Files.exists(file, LinkOption.NOFOLLOW_LINKS);
- final long size = exists ? Files.size(file) : 0;
+ final long size = exists && Files.exists(file) ? Files.size(file) : 0;
if (overrideReadOnly(options) && exists) {
setReadOnly(file, false, LinkOption.NOFOLLOW_LINKS);
}
--
2.28.0

@ -2,21 +2,20 @@
Name: apache-commons-io Name: apache-commons-io
Epoch: 1 Epoch: 1
Version: 2.8.0 Version: 2.11.0
Release: 10%{?dist} Release: 2%{?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: https://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: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
Patch0: 0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch
BuildRequires: maven-local-openjdk8
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: javapackages-bootstrap BuildRequires: javapackages-bootstrap-openjdk8
%else %else
BuildRequires: maven-local-openjdk8
BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-lang3)
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)
@ -33,7 +32,6 @@ to assist with developing IO functionality.
%prep %prep
%setup -q -n commons-io-%{version}-src %setup -q -n commons-io-%{version}-src
%patch -P 0 -p1
sed -i 's/\r//' *.txt 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
@ -44,6 +42,7 @@ sed -i '/<argLine>/d' pom.xml
%mvn_alias : org.apache.commons: %mvn_alias : org.apache.commons:
%pom_remove_dep org.junit-pioneer:junit-pioneer %pom_remove_dep org.junit-pioneer:junit-pioneer
%pom_remove_dep :junit-bom
%pom_remove_dep com.google.jimfs:jimfs %pom_remove_dep com.google.jimfs:jimfs
# Test depends on com.google.jimfs:jimfs # Test depends on com.google.jimfs:jimfs
@ -73,24 +72,23 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea
%doc RELEASE-NOTES.txt %doc RELEASE-NOTES.txt
%changelog %changelog
* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:2.8.0-10 * Fri Jul 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1:2.11.0-2
- Fix patch usage - Rebuilt for MSVSphere 9.2
* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:2.8.0-9 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11.0-2
- Rebuild with regenerated Requires on Java - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-8 * Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.11.0-1
- Rebuild to regenerate auto-requires - Update to upstream version 2.11.0
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.8.0-7 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:2.8.0-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for java-17-openjdk as system jdk
Related: rhbz#1991688
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-6 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8.0-6
- Rebuild to workaround DistroBaker issue - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-5 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8.0-5
- Bootstrap Maven for CentOS Stream 9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-4 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-4
- Bootstrap build - Bootstrap build

Loading…
Cancel
Save