diff --git a/.apache-commons-codec.metadata b/.apache-commons-codec.metadata index e14547c..127c555 100644 --- a/.apache-commons-codec.metadata +++ b/.apache-commons-codec.metadata @@ -1 +1 @@ -2ff502f16cc9d6619a5d05dea2579196a08b05bb SOURCES/commons-codec-1.15-src.tar.gz +89db5363a3ff215a2c0f13049c2482bd15aba20a SOURCES/commons-codec-1.17.1-src.tar.gz diff --git a/.gitignore b/.gitignore index e5538d6..0b9bf89 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/commons-codec-1.15-src.tar.gz +SOURCES/commons-codec-1.17.1-src.tar.gz diff --git a/SPECS/apache-commons-codec.spec b/SPECS/apache-commons-codec.spec index b62a6ab..becc753 100644 --- a/SPECS/apache-commons-codec.spec +++ b/SPECS/apache-commons-codec.spec @@ -1,26 +1,28 @@ %bcond_with bootstrap Name: apache-commons-codec -Version: 1.15 -Release: 10%{?dist} +Version: 1.17.1 +Release: 8%{?dist} Summary: Implementations of common encoders and decoders -License: ASL 2.0 +License: Apache-2.0 URL: https://commons.apache.org/codec/ BuildArch: noarch -ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch +ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/codec/source/commons-codec-%{version}-src.tar.gz # Data in DoubleMetaphoneTest.java originally has an inadmissible license. # The author gives MIT in e-mail communication. Source1: aspell-mail.txt -BuildRequires: maven-local-openjdk8 %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: mvn(junit:junit) +BuildRequires: maven-local BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.hamcrest:hamcrest) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) %endif %description @@ -28,10 +30,14 @@ Commons Codec is an attempt to provide definitive implementations of commonly used encoders and decoders. Examples include Base64, Hex, Phonetic and URLs. -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep -%autosetup -n commons-codec-%{version}-src +%autosetup -p1 -n commons-codec-%{version}-src cp %{SOURCE1} aspell-mail.txt sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt @@ -39,9 +45,6 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %mvn_alias : commons-codec:commons-codec %build -# Avoid running out of heap on s390x during test suite execution -export MAVEN_OPTS="-Xmx1024m" - %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.codec %install @@ -51,28 +54,65 @@ export MAVEN_OPTS="-Xmx1024m" %license LICENSE.txt NOTICE.txt aspell-mail.txt %doc RELEASE-NOTES* +%files javadoc -f .mfiles-javadoc + %changelog -* Sat Nov 23 2024 Marián Konček - 1.15-10 -- Add noarch to ExclusiveArch +* Fri Nov 29 2024 Mikolaj Izdebski - 1.17.1-7 +- Update javapackages test plan to f42 -* Sat Nov 23 2024 Marián Konček - 1.15-9 -- Disable building on i686 +* Tue Sep 03 2024 Mikolaj Izdebski - 1.17.1-6 +- Use %%autosetup -C -* Wed Nov 20 2024 Marián Konček - 1.15-8 -- Rebuild with regenerated Requires on Java +* Wed Jul 17 2024 Fedora Release Engineering - 1.17.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild -* Mon Jan 30 2023 Mikolaj Izdebski - 1.15-7 -- Rebuild to regenerate auto-requires +* Tue Jul 16 2024 Marian Koncek - 1.17.1-1 +- Update to upstream version 1.17.1 -* Mon Aug 09 2021 Mohan Boddu - 1.15-6 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Tue Apr 02 2024 Marian Koncek - 1.16.1-1 +- Update to upstream version 1.16.1 -* Wed Jun 09 2021 Mikolaj Izdebski - 1.15-5 -- Rebuild to workaround DistroBaker issue +* Tue Feb 27 2024 Jiri Vanek - 1.16.0-7 +- Rebuilt for java-21-openjdk as system jdk -* Tue Jun 08 2021 Mikolaj Izdebski - 1.15-4 -- Bootstrap Maven for CentOS Stream 9 +* Fri Feb 23 2024 Jiri Vanek - 1.16.0-6 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.16.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.16.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 1.16.0-3 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.16.0-2 +- Rebuild + +* Thu Aug 17 2023 Mikolaj Izdebski - 1.16.0-1 +- Update to upstream version 1.16.0 + +* Thu Aug 10 2023 Marian Koncek - 1.15-10 +- Use implicit maven toolchains + +* Wed Jul 19 2023 Fedora Release Engineering - 1.15-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.15-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.15-6 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.15-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Mon May 17 2021 Mikolaj Izdebski - 1.15-3 - Bootstrap build