diff --git a/.gitignore b/.gitignore index 744a44c..a889430 100644 --- a/.gitignore +++ b/.gitignore @@ -22,5 +22,3 @@ macros.zip /ij154k-src.zip /ij154m-src.zip /ij154n-src.zip -/ij154p-src.zip -/ij154r-src.zip diff --git a/changelog b/changelog index 5137285..22d2371 100644 --- a/changelog +++ b/changelog @@ -1,10 +1,7 @@ -* Thu Jul 18 2024 Fedora Release Engineering - 1.54i-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Mon Mar 04 2024 Benjamin A. Beasley - 1.54i-1 - Update to 1.54i (close RHBZ#2267596) -* Tue Feb 27 2024 Jiri Vanek - 1.54h-4 +* Sat Mar 02 2024 Jiri Vanek - 1.54h-4 - Rebuilt for java-21-openjdk as system jdk * Wed Jan 24 2024 Fedora Release Engineering - 1.54h-3 diff --git a/imagej.spec b/imagej.spec index 9cce0f4..a45c50d 100644 --- a/imagej.spec +++ b/imagej.spec @@ -1,5 +1,5 @@ Name: imagej -Version: 1.54r +Version: 1.54n 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-openjdk25 +BuildRequires: ant BuildRequires: desktop-file-utils BuildRequires: jpackage-utils -BuildRequires: java-25-devel +BuildRequires: java-devel Requires: jpackage-utils # Require java-devel, not only java, for plugins build -Requires: java-25-devel +Requires: java-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 ff75b1f..d36ef29 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ij154r-src.zip) = eca256a4de84d46830e27dc452816c4fb209d1e1a62e555cc3984f46bdc3341d6bd8c7edc39adbe0ff0710de6141a170c5402d125e31ba0194a61368f49e9698 +SHA512 (ij154n-src.zip) = 58a60206133de79a6736ea8ae8d4e37664cbc8c8483f75d7929526631c01cec37655a34310087730a832cd3db5c34f364247b2e3cb7285a72c213b42c0819cba SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3