From 0074aad3d9d8c6dd1e3187e497101aafdd163072 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 14:48:16 +0200 Subject: [PATCH 01/14] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- ditaa.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 126d443..3ca99d2 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -11,6 +11,7 @@ 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 +ExclusiveArch: %{java_arches} noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant BuildRequires: jpackage-utils @@ -54,6 +55,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From eec69bcb593180aef3ecfe9ac6e993d51f743ba8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 00:33:39 +0000 Subject: [PATCH 02/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 3ca99d2..fa1718d 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -55,6 +55,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 800ab0d9fbe2028221b61dba42904c2ac6406e62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 01:30:03 +0000 Subject: [PATCH 03/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index fa1718d..caa21d8 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -55,6 +55,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 5c3c8a32c42fc56ec4f277b2f023fb2a94815acd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 17:34:04 +0000 Subject: [PATCH 04/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index caa21d8..2e3abae 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -55,6 +55,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 522dbdaf71e297d6ab2fdfade2b6e6e01f1d8067 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:15:44 +0000 Subject: [PATCH 05/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 2e3abae..bf6b644 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -55,6 +55,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 0835d6deaf28e72e5595de00e8c8d2966546294d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 09:32:29 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index bf6b644..e3d985b 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -55,6 +55,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 7ff3d4732d2b3599ae4c3d96565d30a3bc53f754 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:18:10 +0100 Subject: [PATCH 07/14] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index e3d985b..444b605 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -55,6 +55,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From b6579fd54c4371f15a7fc0bbe7f99064c00df2dc Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 08/14] Eliminate use of obsolete %patchN syntax (#2283636) --- ditaa.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ditaa.spec b/ditaa.spec index 444b605..68ae76f 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -34,9 +34,9 @@ graphics. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 find -name '*.class' -delete find -name '*.jar' -delete From 7d3566a42fb6f6c1f8dd38340b1a6819fdc02928 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Mon, 1 Jul 2024 12:55:47 +0200 Subject: [PATCH 09/14] Use autosetup macro --- ditaa.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ditaa.spec b/ditaa.spec index 68ae76f..cb9c24f 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -33,10 +33,7 @@ characters that resemble lines like | / - ), into proper bitmap graphics. %prep -%setup -q -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 +%autosetup -p1 find -name '*.class' -delete find -name '*.jar' -delete @@ -55,6 +52,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From eeff52e270fdef3b41eef70785aaa4c0fb2997ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:05:12 +0000 Subject: [PATCH 10/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index cb9c24f..f651f2e 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -52,6 +52,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 0e6f90dc4d39dfc9f1ab1d4b4a281573f9427126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 23:30:58 +0200 Subject: [PATCH 11/14] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ditaa.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ditaa.spec b/ditaa.spec index f651f2e..bec3c3e 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,8 +1,9 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 26%{?dist} -License: GPLv2+ +Release: 27%{?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 @@ -52,6 +53,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 4eb6af7fde6bacace6ee3d8ad9423da7131824fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 15:52:46 +0000 Subject: [PATCH 12/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index bec3c3e..16b20ae 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 27%{?dist} +Release: 28%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://ditaa.sourceforge.net/ @@ -53,6 +53,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 0f06b207862986c9a0bc1e68ac0875ddd1defbe3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:20:34 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 16b20ae..dfde01a 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 28%{?dist} +Release: 29%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://ditaa.sourceforge.net/ @@ -53,6 +53,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* 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 From 6836bf65e16f4de3be829d5fabbb0baca6639cc8 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 18:55:36 +0200 Subject: [PATCH 14/14] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- ditaa.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ditaa.spec b/ditaa.spec index dfde01a..0fe7aac 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 29%{?dist} +Release: 30%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://ditaa.sourceforge.net/ @@ -13,8 +13,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-devel >= 1:1.6.0 -BuildRequires: ant +BuildRequires: java-25-devel >= 1:1.6.0 +BuildRequires: ant-openjdk25 BuildRequires: jpackage-utils BuildRequires: batik BuildRequires: jericho-html @@ -25,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 @@ -53,6 +53,9 @@ 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