rpms/ditaa/F-13 .cvsignore, 1.2, 1.3 ditaa.spec, 1.1, 1.2 sources, 1.2, 1.3

[terjeros]

Author: terjeros

Update of /cvs/pkgs/rpms/ditaa/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13030/F-13

Modified Files:
	.cvsignore ditaa.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ditaa/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jun 2010 06:45:35 -0000	1.2
+++ .cvsignore	26 Jul 2010 18:48:06 -0000	1.3
@@ -1 +1 @@
-ditaa0_9-src.zip
+ditaa-0.9.r74.tar.xz


Index: ditaa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ditaa/F-13/ditaa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ditaa.spec	23 Jun 2010 06:45:35 -0000	1.1
+++ ditaa.spec	26 Jul 2010 18:48:06 -0000	1.2
@@ -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 <terje.rosten at ntnu.no> - 0.9-4.r74
+- Pull sources from svn do get working ditaa using system jericho
+
+* Wed Jun 22 2010 Terje Rosten <terje.rosten at ntnu.no> - 0.9-3
+- Use system jericho-html
+
 * Mon Jun 21 2010 Terje Rosten <terje.rosten at ntnu.no> - 0.9-2
 - Be more generic about jdk 1.6 buildreq
 - Add req on jdk 1.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ditaa/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jun 2010 06:45:36 -0000	1.2
+++ sources	26 Jul 2010 18:48:06 -0000	1.3
@@ -1 +1 @@
-d7230273bf4c28c5029d350842278cf9  ditaa0_9-src.zip
+d28ac984ef6e1e860bc05542a3a1d9a5  ditaa-0.9.r74.tar.xz