diff --git a/ditaa.spec b/ditaa.spec index 126d443..0fe7aac 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,8 +1,9 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 17%{?dist} -License: GPLv2+ +Release: 30%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz Source1: ditaa.wrapper @@ -11,8 +12,9 @@ Patch0: ditaa-0.9-port-to-batik-1.8.patch Patch1: https://sources.debian.org/data/main/d/ditaa/0.10+ds1-1.2/debian/patches/remove-JavadocTaglet.patch Patch2: jdk17.patch BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: ant +ExclusiveArch: %{java_arches} noarch +BuildRequires: java-25-devel >= 1:1.6.0 +BuildRequires: ant-openjdk25 BuildRequires: jpackage-utils BuildRequires: batik BuildRequires: jericho-html @@ -23,7 +25,7 @@ Requires: xml-commons-apis Requires: jericho-html Requires: batik Requires: jpackage-utils -Requires: java-headless >= 1:1.6.0 +Requires: java-25-headless >= 1:1.6.0 %description ditaa is a small command-line utility written in Java, that can @@ -32,10 +34,7 @@ characters that resemble lines like | / - ), into proper bitmap graphics. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 find -name '*.class' -delete find -name '*.jar' -delete @@ -54,6 +53,45 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Mon Jul 28 2025 jiri vanek - 0.10-30 +- Rebuilt for java-25-openjdk as preffered jdk + +* Wed Jul 23 2025 Fedora Release Engineering - 0.10-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 0.10-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 0.10-27 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 0.10-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 01 2024 Terje Rosten - 0.10-25 +- Use autosetup macro + +* Tue Feb 27 2024 Jiri Vanek - 0.10-24 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 0.10-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 0.10-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 0.10-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.10-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.10-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 0.10-18 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 0.10-17 - changed bytecode level to 8