diff --git a/.gitignore b/.gitignore index 3843a9b..97f3ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,13 @@ -commons-io-1.4-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.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 diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 46bb21c..5903eef 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,46 +1,87 @@ +# unit tests do not finish +%bcond_with tests + +%global srcname commons-io + Name: apache-commons-io Epoch: 1 -Version: 2.6 -Release: 10%{?dist} +Version: 2.7 +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 -URL: http://commons.apache.org/io -BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz +URL: https://commons.apache.org/io +Source0: https://archive.apache.org/dist/commons/io/source/%{srcname}-%{version}-src.tar.gz + +BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +%if %{with tests} +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) +%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. -%{?javadoc_package} + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + %prep -%setup -q -n commons-io-%{version}-src +%setup -q -n %{srcname}-%{version}-src sed -i 's/\r//' *.txt -%build +%if %{with tests} +# com.google.jimfs:jimfs is not packaged for fedora +%pom_remove_dep com.google.jimfs:jimfs +rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java + +# junit-pioneer is not packaged for fedora +%pom_remove_dep :junit-pioneer +rm src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java +rm src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java +%endif + %mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: -# NOTE: tests *may* fail because commons-io is on surefire's classpath and causes -# tests to be run against the system version and not the one we just built + +%build +%if %{with tests} %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io +%else +%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io +%endif + %install %mvn_install + %files -f .mfiles %license LICENSE.txt NOTICE.txt %doc RELEASE-NOTES.txt +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt NOTICE.txt + + %changelog +* Tue Aug 18 2020 Fabio Valentini - 1:2.7-1 +- Update to version 2.7. + * Mon Jul 27 2020 Fedora Release Engineering - 1:2.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -176,3 +217,4 @@ sed -i 's/\r//' *.txt * Tue May 11 2010 Stanislav Ochotnicky - 1:1.4-1 - Rename and rebase of jakarta-commons-io - Clean up whole spec + diff --git a/sources b/sources index 3dc47d1..3a7630f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.6-src.tar.gz) = fa22397631283726b85276d8fb367e10755351ef2c4c87c5519485ba68ab26ffa2bfe36ee686f53f82e3aeb9e423618d89ad97b02fb272a549e0d4769928e764 +SHA512 (commons-io-2.7-src.tar.gz) = 9898b59c2aebdc1c51a7f8aca14e3080a08b766404c2aff091b204ba55870129dd95643665a6d46e15e94cd9d4cb280488ab0a28a1c51f43d132f839b742edc3