diff --git a/.gitignore b/.gitignore index 663182f..744a44c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ macros.zip /ij154m-src.zip /ij154n-src.zip /ij154p-src.zip +/ij154r-src.zip diff --git a/imagej.spec b/imagej.spec index 255ed96..9cce0f4 100644 --- a/imagej.spec +++ b/imagej.spec @@ -1,5 +1,5 @@ Name: imagej -Version: 1.54p +Version: 1.54r Release: %autorelease Summary: Image Processing and Analysis in Java @@ -33,15 +33,15 @@ Patch2: imagej-1.53r-unix-script.patch # Set javac source / target version to 1.8 to fix building with Java 11. Patch3: imagej-1.53r-source-target-version.patch -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: desktop-file-utils BuildRequires: jpackage-utils -BuildRequires: java-devel +BuildRequires: java-25-devel Requires: jpackage-utils # Require java-devel, not only java, for plugins build -Requires: java-devel +Requires: java-25-devel # We no longer package javadoc documentation because it has guidelines issues # pertaining to bundled and pre-minified JavaScript and CSS. See diff --git a/sources b/sources index c11d32d..ff75b1f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ij154p-src.zip) = cd051bdefc563bb5492a4380f2cf933cad5b82eb5ff146502cb20014c3be731afd80fe61571ab533d74cbc1266e8091c3103a159b6bcff31600be1a52e7b1fde +SHA512 (ij154r-src.zip) = eca256a4de84d46830e27dc452816c4fb209d1e1a62e555cc3984f46bdc3341d6bd8c7edc39adbe0ff0710de6141a170c5402d125e31ba0194a61368f49e9698 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3