diff --git a/functionaljava-java25.patch b/functionaljava-java25.patch new file mode 100644 index 0000000..afda26e --- /dev/null +++ b/functionaljava-java25.patch @@ -0,0 +1,20 @@ +--- functionaljava-5.0/core/src/main/java/fj/Monoid.java 2025-10-23 17:44:13.280474920 +0200 ++++ functionaljava-5.0/core/src/main/java/fj/Monoid.java 2025-10-23 17:50:46.140970970 +0200 +@@ -1,6 +1,7 @@ + package fj; + + import fj.data.*; ++import fj.data.IO; + + import static fj.Function.*; + import static fj.Semigroup.semigroupDef; +--- functionaljava-5.0/core/src/main/java/fj/P2.java 2025-10-23 17:44:13.280694593 +0200 ++++ functionaljava-5.0/core/src/main/java/fj/P2.java 2025-10-23 17:48:14.924033452 +0200 +@@ -3,6 +3,7 @@ + import static fj.Function.*; + import static fj.P.weakMemo; + import static fj.data.optic.PLens.pLens; ++import fj.data.IO; + import fj.data.*; + import fj.data.optic.Lens; + import fj.data.optic.PLens; diff --git a/functionaljava.changes b/functionaljava.changes index 26e5bd4..9a98f21 100644 --- a/functionaljava.changes +++ b/functionaljava.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 23 15:52:09 UTC 2025 - Fridrich Strba + +- Added patch: + * functionaljava-java25.patch + + disambiguate name class with the new java.lang.IO (Java 25) + ------------------------------------------------------------------- Tue Dec 13 12:33:31 UTC 2022 - Anton Shvetz diff --git a/functionaljava.spec b/functionaljava.spec index 7e579ff..da5b971 100644 --- a/functionaljava.spec +++ b/functionaljava.spec @@ -26,6 +26,7 @@ URL: http://www.functionaljava.org/ Source0: https://github.com/functionaljava/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://repo1.maven.org/maven2/org/%{name}/%{name}/%{version}/%{name}-%{version}.pom Source2: https://repo1.maven.org/maven2/org/%{name}/%{name}-java-core/%{version}/%{name}-java-core-%{version}.pom +Patch0: %{name}-java25.patch BuildRequires: maven-local BuildArch: noarch @@ -59,6 +60,7 @@ API documentation for %{name}. %prep %setup -q +%patch -P 0 -p1 cp %{SOURCE1} core/pom.xml cp %{SOURCE2} java-core/pom.xml