From fb45aac6ce942dfab22960d70fc0d97e1b92c73c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:20:00 -0500 Subject: [PATCH 01/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index e4f468d..9adc9c4 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -4,7 +4,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.9 -Release: 9.r%{svn}%{?dist} +Release: 10.r%{svn}%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -67,6 +67,9 @@ ant -f build/release.xml %{_javadir}/%{name}.jar %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.9-10.r74 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 0.9-9.r74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 8cd396bdbc0061e655f4fd713d8c0aca122d68c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 22 Oct 2013 18:19:36 +0200 Subject: [PATCH 02/39] Switch to unversioned jar (bz #1022093) --- ditaa.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/ditaa.spec b/ditaa.spec index 9adc9c4..7fb7bd2 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -4,7 +4,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.9 -Release: 10.r%{svn}%{?dist} +Release: 11.r%{svn}%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -16,7 +16,6 @@ URL: http://ditaa.sourceforge.net/ Source0: ditaa-0.9.r%{svn}.tar.xz Source1: ditaa.wrapper Patch0: ditaa-0.9-batik-png.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant @@ -45,28 +44,23 @@ find -name '*.class' -delete find -name '*.jar' -delete %build -%{__install} -d bin +install -d bin build-jar-repository -s -p lib commons-cli batik-all xml-commons-apis-ext jericho-html ant -f build/release.xml %install -%{__rm} -rf %{buildroot} -%{__install} -D -p -m 0644 releases/%{name}%{over}.jar \ - %{buildroot}%{_javadir}/%{name}-%{version}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -%{__install} -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} - -%clean -%{__rm} -rf %{buildroot} +install -D -p -m 0644 releases/%{name}%{over}.jar %{buildroot}%{_javadir}/%{name}.jar +install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %files -%defattr(-, root, root, -) %doc COPYING HISTORY %{_bindir}/%{name} -%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %changelog +* Tue Oct 22 2013 Terje Rosten - 0.9-11.r74 +- Switch to unversioned jar (bz #1022093) + * Sat Aug 03 2013 Fedora Release Engineering - 0.9-10.r74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -88,7 +82,7 @@ ant -f build/release.xml * Mon Jul 26 2010 Terje Rosten - 0.9-4.r74 - Pull sources from svn do get working ditaa using system jericho -* Wed Jun 22 2010 Terje Rosten - 0.9-3 +* Tue Jun 22 2010 Terje Rosten - 0.9-3 - Use system jericho-html * Mon Jun 21 2010 Terje Rosten - 0.9-2 From 1fb7979dc0c66c999b215309478e4b1592bbe72a Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 28 Mar 2014 18:45:27 +0100 Subject: [PATCH 03/39] Use Requires: java-headless rebuild (#1067528) Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- ditaa.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ditaa.spec b/ditaa.spec index 7fb7bd2..a73b742 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -4,7 +4,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.9 -Release: 11.r%{svn}%{?dist} +Release: 12.r%{svn}%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -29,7 +29,7 @@ Requires: xml-commons-apis Requires: jericho-html Requires: batik Requires: jpackage-utils -Requires: java >= 1:1.6.0 +Requires: java-headless >= 1:1.6.0 %description ditaa is a small command-line utility written in Java, that can @@ -58,6 +58,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Fri Mar 28 2014 Michael Simacek - 0.9-12.r74 +- Use Requires: java-headless rebuild (#1067528) + * Tue Oct 22 2013 Terje Rosten - 0.9-11.r74 - Switch to unversioned jar (bz #1022093) From 62b667528416848ae950829454b754124ac4e2d4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 02:31:30 -0500 Subject: [PATCH 04/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index a73b742..945dfdd 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -4,7 +4,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.9 -Release: 12.r%{svn}%{?dist} +Release: 13.r%{svn}%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -58,6 +58,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.9-13.r74 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Mar 28 2014 Michael Simacek - 0.9-12.r74 - Use Requires: java-headless rebuild (#1067528) From c716432ec97391e833be9bcfc42f97803ed4100f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 04:08:16 +0000 Subject: [PATCH 05/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 945dfdd..7c4cebb 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -4,7 +4,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.9 -Release: 13.r%{svn}%{?dist} +Release: 14.r%{svn}%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -58,6 +58,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.9-14.r74 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.9-13.r74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 8902ec5b5e69dccdb3ae0b201a27ea843215b08b Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 31 Aug 2015 12:50:31 +0200 Subject: [PATCH 06/39] Fix FTBFS (Resolves: rhbz#1239429) --- ditaa-0.9-batik-png.patch | 13 ------------- ditaa-0.9-port-to-batik-1.8.patch | 31 +++++++++++++++++++++++++++++++ ditaa.spec | 7 +++++-- 3 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 ditaa-0.9-batik-png.patch create mode 100644 ditaa-0.9-port-to-batik-1.8.patch diff --git a/ditaa-0.9-batik-png.patch b/ditaa-0.9-batik-png.patch deleted file mode 100644 index b847423..0000000 --- a/ditaa-0.9-batik-png.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ditaa/src/org/stathissideris/ascii2image/graphics/ImageHandler.java~ 2009-11-12 22:32:30.000000000 +0100 -+++ ditaa/src/org/stathissideris/ascii2image/graphics/ImageHandler.java 2010-06-20 23:02:08.000000000 +0200 -@@ -45,8 +45,8 @@ - import org.apache.batik.bridge.UserAgentAdapter; - import org.apache.batik.dom.svg.SAXSVGDocumentFactory; - import org.apache.batik.dom.util.DocumentFactory; --import org.apache.batik.ext.awt.image.codec.PNGEncodeParam; --import org.apache.batik.ext.awt.image.codec.PNGImageEncoder; -+import org.apache.batik.ext.awt.image.codec.png.PNGEncodeParam; -+import org.apache.batik.ext.awt.image.codec.png.PNGImageEncoder; - import org.apache.batik.gvt.GraphicsNode; - import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory; - import org.apache.batik.gvt.renderer.ImageRenderer; diff --git a/ditaa-0.9-port-to-batik-1.8.patch b/ditaa-0.9-port-to-batik-1.8.patch new file mode 100644 index 0000000..d61846c --- /dev/null +++ b/ditaa-0.9-port-to-batik-1.8.patch @@ -0,0 +1,31 @@ +diff --git a/src/org/stathissideris/ascii2image/graphics/ImageHandler.java b/src/org/stathissideris/ascii2image/graphics/ImageHandler.java +index 72470d1..d6a5a9d 100755 +--- a/src/org/stathissideris/ascii2image/graphics/ImageHandler.java ++++ b/src/org/stathissideris/ascii2image/graphics/ImageHandler.java +@@ -43,10 +43,10 @@ import javax.swing.JLabel; + import org.apache.batik.bridge.BridgeContext; + import org.apache.batik.bridge.GVTBuilder; + import org.apache.batik.bridge.UserAgentAdapter; +-import org.apache.batik.dom.svg.SAXSVGDocumentFactory; ++import org.apache.batik.anim.dom.SAXSVGDocumentFactory; + import org.apache.batik.dom.util.DocumentFactory; +-import org.apache.batik.ext.awt.image.codec.PNGEncodeParam; +-import org.apache.batik.ext.awt.image.codec.PNGImageEncoder; ++import org.apache.batik.ext.awt.image.codec.png.PNGEncodeParam; ++import org.apache.batik.ext.awt.image.codec.png.PNGImageEncoder; + import org.apache.batik.gvt.GraphicsNode; + import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory; + import org.apache.batik.gvt.renderer.ImageRenderer; +diff --git a/src/org/stathissideris/ascii2image/graphics/OffScreenSVGRenderer.java b/src/org/stathissideris/ascii2image/graphics/OffScreenSVGRenderer.java +index 9bf1f38..527d174 100755 +--- a/src/org/stathissideris/ascii2image/graphics/OffScreenSVGRenderer.java ++++ b/src/org/stathissideris/ascii2image/graphics/OffScreenSVGRenderer.java +@@ -30,7 +30,7 @@ import java.io.StringReader; + import org.apache.batik.bridge.BridgeContext; + import org.apache.batik.bridge.GVTBuilder; + import org.apache.batik.bridge.UserAgentAdapter; +-import org.apache.batik.dom.svg.SAXSVGDocumentFactory; ++import org.apache.batik.anim.dom.SAXSVGDocumentFactory; + import org.apache.batik.gvt.GraphicsNode; + import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory; + import org.apache.batik.gvt.renderer.ImageRenderer; diff --git a/ditaa.spec b/ditaa.spec index 7c4cebb..a8d1d58 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -4,7 +4,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.9 -Release: 14.r%{svn}%{?dist} +Release: 15.r%{svn}%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -15,7 +15,7 @@ URL: http://ditaa.sourceforge.net/ # tar cJvf ditaa-0.9.r%{svn}.tar.xz ditaa-0.9 Source0: ditaa-0.9.r%{svn}.tar.xz Source1: ditaa.wrapper -Patch0: ditaa-0.9-batik-png.patch +Patch0: ditaa-0.9-port-to-batik-1.8.patch BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant @@ -58,6 +58,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Mon Aug 31 2015 Michal Srb - 0.9-15.r74 +- Fix FTBFS (Resolves: rhbz#1239429) + * Wed Jun 17 2015 Fedora Release Engineering - 0.9-14.r74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3147969645dd753d581fb99e4495b1df3b7d0284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 31 Aug 2015 18:48:22 +0200 Subject: [PATCH 07/39] 0.10 - New upstream location --- .gitignore | 1 + ditaa.spec | 20 ++++++++------------ sources | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 21026a9..895b688 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ditaa-0.9.r74.tar.xz +/v0.10.tar.gz diff --git a/ditaa.spec b/ditaa.spec index a8d1d58..306eeb5 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,19 +1,11 @@ -%global over 0_9 -%global svn 74 - Summary: Diagrams Through ASCII Art Name: ditaa -Version: 0.9 -Release: 15.r%{svn}%{?dist} +Version: 0.10 +Release: 1%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ -#Source0: http://downloads.sourceforge.net/ditaa/ditaa%{over}-src.zip -# Sources pulled from svn: -# rm -rf ditaa-0.9 -# svn co -r%{svn} https://ditaa.svn.sourceforge.net/svnroot/ditaa/trunk ditaa-0.9 -# tar cJvf ditaa-0.9.r%{svn}.tar.xz ditaa-0.9 -Source0: ditaa-0.9.r%{svn}.tar.xz +Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz Source1: ditaa.wrapper Patch0: ditaa-0.9-port-to-batik-1.8.patch BuildArch: noarch @@ -49,7 +41,7 @@ build-jar-repository -s -p lib commons-cli batik-all xml-commons-apis-ext jerich ant -f build/release.xml %install -install -D -p -m 0644 releases/%{name}%{over}.jar %{buildroot}%{_javadir}/%{name}.jar +install -D -p -m 0644 releases/%{name}0_9.jar %{buildroot}%{_javadir}/%{name}.jar install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %files @@ -58,6 +50,10 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Mon Aug 31 2015 Terje Rosten - 0.10-1 +- 0.10 +- New upstream location + * Mon Aug 31 2015 Michal Srb - 0.9-15.r74 - Fix FTBFS (Resolves: rhbz#1239429) diff --git a/sources b/sources index 7ccfd05..91e0f76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d28ac984ef6e1e860bc05542a3a1d9a5 ditaa-0.9.r74.tar.xz +3b670012fffc872bbc58adc6aced8973 v0.10.tar.gz From 484edf55d97aa8291a07f321a187d34e7f3e615c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:47:09 +0000 Subject: [PATCH 08/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 306eeb5..9683b2f 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -50,6 +50,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Aug 31 2015 Terje Rosten - 0.10-1 - 0.10 - New upstream location From 02d821e92ca34888313e812f9b01fa295071c1ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:26:32 +0000 Subject: [PATCH 09/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 9683b2f..c3f0f0b 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -50,6 +50,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3c3c48ceddf390974cb6522b7f94b769398101bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:17:10 +0000 Subject: [PATCH 10/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index c3f0f0b..fbe6cc5 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -50,6 +50,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b56dc6fc1b56f3ff34987820fefd52a6dd7e4c2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 06:56:47 +0000 Subject: [PATCH 11/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 fbe6cc5..9eee0b3 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -50,6 +50,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 39092e78dbf20665120811f954de66c9a26c85d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:56:12 +0000 Subject: [PATCH 12/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 9eee0b3..928529c 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ @@ -50,6 +50,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 473b11b0b5223939847f385399f8f6bbc355fa9d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:42 +0100 Subject: [PATCH 13/39] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- ditaa.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 928529c..34b0879 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -2,7 +2,6 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 Release: 6%{?dist} -Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz From 6efb166cc2f6041de5ff45c0908154935a477184 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 17:18:25 +0000 Subject: [PATCH 14/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 34b0879..51c7fae 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -49,6 +49,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 0.10-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d361c3da742c60461335f1c367f8b5919e425205 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 22:05:17 +0000 Subject: [PATCH 15/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 51c7fae..1ddf589 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -49,6 +49,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 0.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b735fd05d81e3ea7e41a31193e3d40252cbeed1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 15:56:47 +0000 Subject: [PATCH 16/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 1ddf589..c6b7d28 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -49,6 +49,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 0.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 697c419a2f73a7610a45c77c0d87403a7e3f272e Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 18:11:59 +0200 Subject: [PATCH 17/39] Rebuilt for JDK-11 --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index c6b7d28..3adae80 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -49,6 +49,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Fri Jul 10 2020 Jiri Vanek - 0.10-10 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Jan 28 2020 Fedora Release Engineering - 0.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 49f51f00f9bcdbea2c5a48d5ffb8a92fdc96ae10 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 19 Jul 2020 21:31:46 +0200 Subject: [PATCH 18/39] Add patch from Debian to build with JDK 10+ --- ditaa.spec | 8 +- remove-JavadocTaglet.patch | 345 +++++++++++++++++++++++++++++++++++++ 2 files changed, 352 insertions(+), 1 deletion(-) create mode 100644 remove-JavadocTaglet.patch diff --git a/ditaa.spec b/ditaa.spec index 3adae80..0487f85 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,12 +1,14 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz Source1: ditaa.wrapper Patch0: ditaa-0.9-port-to-batik-1.8.patch +# Patch from Debian to build with JDK 10+ +Patch1: https://sources.debian.org/data/main/d/ditaa/0.10+ds1-1.2/debian/patches/remove-JavadocTaglet.patch BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant @@ -31,6 +33,7 @@ graphics. %prep %setup -q %patch0 -p1 +%patch1 -p1 find -name '*.class' -delete find -name '*.jar' -delete @@ -49,6 +52,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Sun Jul 19 2020 Terje Rosten - 0.10-11 +- Add patch from Debian to build with JDK 10+ + * Fri Jul 10 2020 Jiri Vanek - 0.10-10 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 diff --git a/remove-JavadocTaglet.patch b/remove-JavadocTaglet.patch new file mode 100644 index 0000000..996d809 --- /dev/null +++ b/remove-JavadocTaglet.patch @@ -0,0 +1,345 @@ +From: Markus Koschany +Date: Wed, 13 Jun 2018 22:58:25 +0200 +Subject: remove JavadocTaglet + +Remove JavadocTaglet class because the Taglet class has been removed in +Java 10. + +Bug-Debian: https://bugs.debian.org/897494 +--- + .../ascii2image/core/JavadocTaglet.java | 326 --------------------- + 1 file changed, 326 deletions(-) + delete mode 100644 src/org/stathissideris/ascii2image/core/JavadocTaglet.java + +diff --git a/src/org/stathissideris/ascii2image/core/JavadocTaglet.java b/src/org/stathissideris/ascii2image/core/JavadocTaglet.java +deleted file mode 100644 +index f1642ef..0000000 +--- a/src/org/stathissideris/ascii2image/core/JavadocTaglet.java ++++ /dev/null +@@ -1,326 +0,0 @@ +-/* +- * Text Diagram Taglet +- * +- * Copyright (C) 2006 Nordic Growth Market NGM AB, +- * Mikael Brannstrom. +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +- * +- */ +-package org.stathissideris.ascii2image.core; +- +-import com.sun.javadoc.ProgramElementDoc; +-import com.sun.javadoc.Tag; +-import com.sun.tools.doclets.Taglet; +-import com.sun.tools.doclets.internal.toolkit.Configuration; +-import com.sun.tools.doclets.standard.Standard; +-import java.awt.image.RenderedImage; +-import java.io.File; +-import java.io.IOException; +-import java.io.UnsupportedEncodingException; +-import java.lang.reflect.Field; +-import java.lang.reflect.Method; +-import java.util.Map; +-import java.util.regex.Pattern; +-import javax.imageio.ImageIO; +- +-import org.stathissideris.ascii2image.text.TextGrid; +-import org.stathissideris.ascii2image.graphics.Diagram; +-import org.stathissideris.ascii2image.core.ConversionOptions; +-import org.stathissideris.ascii2image.graphics.BitmapRenderer; +- +-/** This class is a custom Javadoc taglet for embedding ditaa diagrams in +- * javadoc comments. The tag is an inline which can be used in any javadoc +- * comment. The tag can also be used in package documentation and in the +- * overview. +- * This taglet assumes that the Standard Javadoc Doclet is being used. +- *

+- * The syntax is:
+- * +- * {@textdiagram diagram_name
+- * the ascii art diagram
+- * } +- * +- *

+- * The diagram name will be used when generating the image, so that the image +- * can be referenced to somewhere else (by using an a-href HTML tag). The +- * diagram name can only contain letters, numbers and underscore. The name of +- * the generated image will become "<classname>-<diagram name>.png". +- *

+- * The syntax for the ditaa diagram is described at +- * http://ditaa.sourceforge.net/. +- *

+- * Note: The overview file needs to be named "overview.html" if it lies +- * in the source path, otherwise it is sufficient that it ends with ".html". +- * +- * @author Mikael Brannstrom +- */ +-public class JavadocTaglet implements Taglet { +- +- private static final String NAME = "textdiagram"; +- private static final Pattern FIGURE_NAME_PATTERN = Pattern.compile("\\w+"); +- +- private final File[] srcPath; +- private final File dstDir; +- +- private final boolean simpleMode; +- +- /** Creates a new instance of TextDiagramTaglet */ +- public JavadocTaglet() { +- +- String configSourcepath = null; +- String configDestDirName = null; +- // Try to get configuration +- try { +- // Do this: Configuration config = Standard.htmlDoclet.configuration(); +- Field htmlDocletField = Standard.class.getField("htmlDoclet"); +- Object htmlDoclet = htmlDocletField.get(null); // static field +- Method configurationMethod = htmlDoclet.getClass().getMethod("configuration", null); +- Object config = configurationMethod.invoke(htmlDoclet, null); +- // Do this: configSourcepath = config.sourcepath; +- Field sourcepathField = config.getClass().getField("sourcepath"); +- configSourcepath = (String)sourcepathField.get(config); +- // Do this: configDestDirName = config.destDirName; +- Field destDirNameField = config.getClass().getField("destDirName"); +- configDestDirName = (String)destDirNameField.get(config); +- } catch(Exception e) { +- warning("Could not setup taglet. Falling back to simple mode.\n"+e); +- } +- +- if(configDestDirName == null) { +- srcPath = null; +- dstDir = null; +- simpleMode = true; +- } else { +- // setup srcPath +- String[] srcPathStr = configSourcepath.split("[;:]"); +- srcPath = new File[srcPathStr.length]; +- for(int i=0; i"; +- } +- +- int i; +- if(i1 == -1 || i1 == -1) +- i = Math.max(i1, i2); +- else +- i = Math.min(i1, i2); +- +- figureName = text.substring(0, i); +- figureText = text.substring(i+1); +- +- if(!FIGURE_NAME_PATTERN.matcher(figureName).matches()) { +- error("Illegal "+getName()+" name: \""+figureName+"\""); +- } +- +- // Convert [d] to {d} where d can be 1 character and more +- figureText = figureText.replaceAll("\\[(\\w+)\\]", "{$1}"); +- +- if(simpleMode) { +- StringBuffer strBuf = new StringBuffer(); +- strBuf.append("

");
+-			strBuf.append(figureText);
+-			strBuf.append("
"); +- return strBuf.toString(); +- } else { +- File outputFile = getOutputFile(tag.position().file(), figureName); +- generateImage(figureText, outputFile); +- +- StringBuffer strBuf = new StringBuffer(); +- strBuf.append("\"");"); +- return strBuf.toString(); +- } +- } +- +- /** Returns null since this is an inline tag. +- */ +- public String toString(Tag[] tag) { +- return null; // should return null, this is an inline tag +- } +- +- /** Returns the path of the output file given +- * the source file and the diagram name. +- * @param srcFile the source file which contains the tag +- * @param name the diagram name that will be used for generating the output +- * filename. +- */ +- private File getOutputFile(File srcFile, String name) { +- String relPath = getRelativePath(srcFile); +- +- // Special hack for the overview file +- if(srcFile.getName().toLowerCase().equals("overview.html") || +- (relPath == null && srcFile.getName().toLowerCase().endsWith(".html"))) { +- relPath = "overview"; +- } +- +- if(relPath == null) { +- error("The file is not relative to the source path: "+srcFile); +- } +- +- // get the filename and dirname +- String dirname=null, filename=null; +- int i = relPath.lastIndexOf(File.separatorChar); +- if(i == -1) { +- filename = relPath; +- } else if(i == 0) { +- filename = relPath.substring(1); +- } else { +- filename = relPath.substring(i+1); +- dirname = relPath.substring(0, i); +- } +- +- // skip file ending in filename +- i = filename.lastIndexOf('.'); +- if(i != -1) +- filename = filename.substring(0, i); +- +- String path; +- if(dirname == null) { +- path = filename; +- } else { +- path = dirname+File.separator+filename; +- } +- +- return new File(dstDir, path+"-"+name+".png"); +- } +- +- /** Returns the relative path of a (source) file. +- * The path is relative to one of the source dirs specified to the +- * standard doclet. +- * @returns the relative path. If a relative path could not be found +- * null is returned. +- */ +- private String getRelativePath(File file) { +- file = file.getAbsoluteFile(); +- try { +- file = file.getCanonicalFile(); +- } catch (IOException ex) { +- warning("Could not get canonical path of file: "+file); +- } +- String filePath = file.getAbsolutePath(); +- for(int i=0; i Date: Mon, 27 Jul 2020 15:28:17 +0000 Subject: [PATCH 19/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 0487f85..d2ac7f9 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 11%{?dist} +Release: 12%{?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 +* Mon Jul 27 2020 Fedora Release Engineering - 0.10-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jul 19 2020 Terje Rosten - 0.10-11 - Add patch from Debian to build with JDK 10+ From 38e299980cc3511e77bc12a2c441c30304021f13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 03:29:27 +0000 Subject: [PATCH 20/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 d2ac7f9..ae4e145 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 12%{?dist} +Release: 13%{?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 +* Tue Jan 26 2021 Fedora Release Engineering - 0.10-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.10-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1859bbfd79aa27d5fca23c98ae44601ba031ad20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:52:02 +0000 Subject: [PATCH 21/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 ae4e145..510b3d6 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 13%{?dist} +Release: 14%{?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 21 2021 Fedora Release Engineering - 0.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.10-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dda43efda0e510af87943e402b905264729ae933 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:45:19 +0000 Subject: [PATCH 22/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 510b3d6..0311e5d 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 14%{?dist} +Release: 15%{?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 +* Thu Jan 20 2022 Fedora Release Engineering - 0.10-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.10-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0300776174b834c1e162b57a85d58dcacccc842c Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 20:27:04 +0100 Subject: [PATCH 23/39] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- ditaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 0311e5d..37c829a 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 15%{?dist} +Release: 16%{?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 +* Sat Feb 05 2022 Jiri Vanek - 0.10-16 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 0.10-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 42969e9dc3e2f7278d846f34d24947f263d38d42 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 8 Feb 2022 14:50:50 +0100 Subject: [PATCH 24/39] Fixed source level to pass jdk17 --- ditaa.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ditaa.spec b/ditaa.spec index 37c829a..126d443 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,7 +1,7 @@ Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.10 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ URL: http://ditaa.sourceforge.net/ Source0: https://github.com/stathissideris/ditaa/archive/v%{version}.tar.gz @@ -9,6 +9,7 @@ Source1: ditaa.wrapper Patch0: ditaa-0.9-port-to-batik-1.8.patch # Patch from Debian to build with JDK 10+ 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 @@ -34,6 +35,7 @@ graphics. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 find -name '*.class' -delete find -name '*.jar' -delete @@ -52,6 +54,9 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_javadir}/%{name}.jar %changelog +* Sat Feb 05 2022 Jiri Vanek - 0.10-17 +- changed bytecode level to 8 + * Sat Feb 05 2022 Jiri Vanek - 0.10-16 - Rebuilt for java-17-openjdk as system jdk From ab42a1ca7911ea65511024d083744f0b95787352 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 8 Feb 2022 15:06:52 +0100 Subject: [PATCH 25/39] Missing patch --- jdk17.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 jdk17.patch diff --git a/jdk17.patch b/jdk17.patch new file mode 100644 index 0000000..82472b6 --- /dev/null +++ b/jdk17.patch @@ -0,0 +1,12 @@ +--- a/build/release.xml ++++ a/build/release.xml +@@ -35,7 +35,7 @@ + + + +- ++ + + + + From 0074aad3d9d8c6dd1e3187e497101aafdd163072 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 14:48:16 +0200 Subject: [PATCH 26/39] 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 27/39] 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 28/39] 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 29/39] 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 30/39] 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 31/39] 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 32/39] 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 33/39] 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 34/39] 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 35/39] 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 36/39] 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 37/39] 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 38/39] 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 39/39] 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