From 2984362409266627e1bd2ab3a5e5065f45c09f81 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 23 Jun 2010 01:59:37 +0000 Subject: [PATCH 1/4] Initialize branch F-13 for ditaa --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From edfb8f1ab5c8ffc53a44d6ab56a311555a5c626b Mon Sep 17 00:00:00 2001 From: terjeros Date: Wed, 23 Jun 2010 06:45:36 +0000 Subject: [PATCH 2/4] Import ditaa. --- .cvsignore | 1 + ditaa-0.9-batik-png.patch | 13 ++++++++ ditaa.spec | 68 +++++++++++++++++++++++++++++++++++++++ ditaa.wrapper | 11 +++++++ sources | 1 + 5 files changed, 94 insertions(+) create mode 100644 ditaa-0.9-batik-png.patch create mode 100644 ditaa.spec create mode 100644 ditaa.wrapper diff --git a/.cvsignore b/.cvsignore index e69de29..e932ac5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +ditaa0_9-src.zip diff --git a/ditaa-0.9-batik-png.patch b/ditaa-0.9-batik-png.patch new file mode 100644 index 0000000..b847423 --- /dev/null +++ b/ditaa-0.9-batik-png.patch @@ -0,0 +1,13 @@ +--- 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.spec b/ditaa.spec new file mode 100644 index 0000000..f775cbe --- /dev/null +++ b/ditaa.spec @@ -0,0 +1,68 @@ +%global over 0_9 + +Summary: Diagrams Through Ascii Art +Name: ditaa +Version: 0.9 +Release: 2%{?dist} +Group: Applications/System +License: GPLv2+ +URL: http://ditaa.sourceforge.net/ +Source0: http://downloads.sourceforge.net/ditaa/ditaa%{over}-src.zip +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 +BuildRequires: jpackage-utils +BuildRequires: batik +BuildRequires: xml-commons-apis +BuildRequires: jakarta-commons-cli +Requires: jakarta-commons-cli +Requires: xml-commons-apis +Requires: batik +Requires: jpackage-utils +Requires: java >= 1:1.6.0 + +%description +ditaa is a small command-line utility written in Java, that can +convert diagrams drawn using ascii art ('drawings' that contain +characters that resemble lines like | / - ), into proper bitmap +graphics. + +%prep +%setup -q -c +%patch0 -p1 +find -name '*.class' -delete +find -name '*.jar' -delete + +%build +%{__install} -d bin +build-jar-repository -s -p lib commons-cli batik-all xml-commons-apis-ext +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} + +%files +%defattr(-, root, root, -) +%doc COPYING HISTORY +%{_bindir}/%{name} +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{name}.jar + +%changelog +* Mon Jun 21 2010 Terje Rosten - 0.9-2 +- Be more generic about jdk 1.6 buildreq +- Add req on jdk 1.6 +- Include some jars to wrapper + +* Sun Jun 20 2010 Terje Rosten - 0.9-1 +- initial build diff --git a/ditaa.wrapper b/ditaa.wrapper new file mode 100644 index 0000000..20e9c77 --- /dev/null +++ b/ditaa.wrapper @@ -0,0 +1,11 @@ +#! /bin/bash +# + +source /usr/share/java-utils/java-functions + +MAIN_CLASS=org.stathissideris.ascii2image.core.CommandLineConverter +BASE_JARS="ditaa commons-cli xml-commons-apis batik" + +set_classpath $BASE_JARS + +run "$@" diff --git a/sources b/sources index e69de29..c648dbc 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d7230273bf4c28c5029d350842278cf9 ditaa0_9-src.zip From e75c51a1318f3add3942b5871ba8c23867e0cac0 Mon Sep 17 00:00:00 2001 From: terjeros Date: Mon, 26 Jul 2010 18:48:06 +0000 Subject: [PATCH 3/4] Sync with rawhide. --- .cvsignore | 2 +- ditaa.spec | 26 ++++++++++++++++++++------ sources | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index e932ac5..21026a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ditaa0_9-src.zip +ditaa-0.9.r74.tar.xz diff --git a/ditaa.spec b/ditaa.spec index f775cbe..9e73edd 100644 --- a/ditaa.spec +++ b/ditaa.spec @@ -1,13 +1,19 @@ %global over 0_9 +%global svn 74 -Summary: Diagrams Through Ascii Art +Summary: Diagrams Through ASCII Art Name: ditaa Version: 0.9 -Release: 2%{?dist} +Release: 4.r%{svn}%{?dist} Group: Applications/System License: GPLv2+ URL: http://ditaa.sourceforge.net/ -Source0: http://downloads.sourceforge.net/ditaa/ditaa%{over}-src.zip +#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 Source1: ditaa.wrapper Patch0: ditaa-0.9-batik-png.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,29 +22,31 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant BuildRequires: jpackage-utils BuildRequires: batik +BuildRequires: jericho-html BuildRequires: xml-commons-apis BuildRequires: jakarta-commons-cli Requires: jakarta-commons-cli Requires: xml-commons-apis +Requires: jericho-html Requires: batik Requires: jpackage-utils Requires: java >= 1:1.6.0 %description ditaa is a small command-line utility written in Java, that can -convert diagrams drawn using ascii art ('drawings' that contain +convert diagrams drawn using ASCII art ('drawings' that contain characters that resemble lines like | / - ), into proper bitmap graphics. %prep -%setup -q -c +%setup -q %patch0 -p1 find -name '*.class' -delete find -name '*.jar' -delete %build %{__install} -d bin -build-jar-repository -s -p lib commons-cli batik-all xml-commons-apis-ext +build-jar-repository -s -p lib commons-cli batik-all xml-commons-apis-ext jericho-html ant -f build/release.xml %install @@ -59,6 +67,12 @@ ant -f build/release.xml %{_javadir}/%{name}.jar %changelog +* 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 +- Use system jericho-html + * Mon Jun 21 2010 Terje Rosten - 0.9-2 - Be more generic about jdk 1.6 buildreq - Add req on jdk 1.6 diff --git a/sources b/sources index c648dbc..7ccfd05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7230273bf4c28c5029d350842278cf9 ditaa0_9-src.zip +d28ac984ef6e1e860bc05542a3a1d9a5 ditaa-0.9.r74.tar.xz From 9d2525389c1408f21a2217fa66abb5ecf51093c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:03:54 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6049265..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ditaa -# $Id$ -NAME := ditaa -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13