diff --git a/ditaa.spec b/ditaa.spec index 0fe7aac..1b94d54 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,9 +1,8 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 30%{?dist} -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +Release: 24%{?dist} +License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz Source1: ditaa.wrapper @@ -13,8 +12,8 @@ Patch1: https://sources.debian.org/data/main/d/ditaa/0.10+ds1-1.2/debian Patch2: jdk17.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: java-25-devel >= 1:1.6.0 -BuildRequires: ant-openjdk25 +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: ant BuildRequires: jpackage-utils BuildRequires: batik BuildRequires: jericho-html @@ -25,7 +24,7 @@ Requires: xml-commons-apis Requires: jericho-html Requires: batik Requires: jpackage-utils -Requires: java-25-headless >= 1:1.6.0 +Requires: java-headless >= 1:1.6.0 %description ditaa is a small command-line utility written in Java, that can @@ -34,7 +33,10 @@ characters that resemble lines like | / - ), into proper bitmap graphics. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 find -name '*.class' -delete find -name '*.jar' -delete @@ -53,25 +55,7 @@ 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 +* Sat Mar 02 2024 Jiri Vanek - 0.10-24 - Rebuilt for java-21-openjdk as system jdk * Wed Jan 24 2024 Fedora Release Engineering - 0.10-23