ditaa-0.10-1.parabola1: updating version

1 files changed, 30 insertions, 20 deletions

diff --git a/libre/ditaa/PKGBUILD b/libre/ditaa/PKGBUILD
index f44854b11..3a290e9ea 100644
--- a/libre/ditaa/PKGBUILD
+++ b/libre/ditaa/PKGBUILD
@@ -1,31 +1,37 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=ditaa
-pkgver=0.9
-pkgrel=2.parabola2
+pkgver=0.10
+pkgrel=1.parabola1
 pkgdesc='Java utility to convert diagrams drawn using ascii art to bitmap'
 arch=('any')
-url='http://ditaa.sf.net/'
-license=('GPL')
-depends=('java-environment' 'java-commons-cli' 'gsfonts')
-makedepends=('apache-ant' 'java-commons-cli' 'java-batik')
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname${pkgver/./_}-src.zip"
-        'ditaa.sh' 'ditaa-fix_imports.patch' 'ditaa-usage_message.patch')
-sha256sums=('0c6b92ddbeb435a1b0180b4728284e7d98e1bd94ec4619e73911875026ef63de'
-            '8640917f1241e26b3104e733b083eb099dc2b5be87e34348479130c3987e7883'
-            '4c24b233dca2ddd2c9a588f09b2aca421706daab68df3304f6ca4f4cd1a79372'
-            '0f8f5bb238ff203592e9f0c9b3194556a97fb9351e32beb14988ca7bedff874b')
+url='https://github.com/stathissideris/ditaa'
+license=('LGPL')
+depends=('java-environment' 'java-commons-cli' 'jericho-html' 'gsfonts')
+makedepends=('git' 'apache-ant' 'java-commons-cli' 'java-batik' 'jericho-html')
+source=("git://github.com/stathissideris/ditaa#tag=v$pkgver"
+        'ditaa.sh' 'ditaa-fix_imports.patch' 'ditaa-usage_message.patch'
+        'ditaa-HTMLConverter.patch')
+sha256sums=('SKIP'
+            '5372004969ae1449fc5dc8eec55dc6970a383169bf9c26be04f6e3ae277c7038'
+            '74a0b7df6865499a25792d981106b669cc51874e673dd621761c30c462fe8deb'
+            '62493fd286d1d80dd96064266bd579c661bbd04409ac448b3ba680e34faeaa56'
+            '8b44c563d4e2d62806e25c3fa6d91b676f388caeb7f819d8d8fec02153f9aa3d')
 
 prepare() {
+  cd "$srcdir/$pkgname"
   rm -v lib/*.jar
+  rm -v web/lib/*.jar
   mkdir -p bin
-  patch -Np1 -i "${srcdir}/ditaa-fix_imports.patch"
-  patch -Np1 -i "${srcdir}/ditaa-usage_message.patch"
+  patch -Np1 -i "$srcdir/ditaa-fix_imports.patch"
+  patch -Np1 -i "$srcdir/ditaa-usage_message.patch"
+  patch -Np1 -i "$srcdir/ditaa-HTMLConverter.patch"
 }
 
 build() {
-  cd "${srcdir}/build"
-  ant -f release.xml release-jar \
+  cd "$srcdir/$pkgname"
+  ant -f build/release.xml release-jar \
+    -Dversion.string=$pkgver \
     -lib "/usr/share/java/batik-anim.jar" \
     -lib "/usr/share/java/batik-awt-util.jar" \
     -lib "/usr/share/java/batik-bridge.jar" \
@@ -34,12 +40,16 @@ build() {
     -lib "/usr/share/java/batik-gvt.jar" \
     -lib "/usr/share/java/batik-svg-dom.jar" \
     -lib "/usr/share/java/commons-cli.jar" \
+    -lib "/usr/share/java/jericho-html.jar" \
     -lib "/usr/share/java/xml-apis-ext.jar"
 }
 
 package() {
-  install -Dm644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-  install -Dm755 "releases/$pkgname${pkgver/./_}.jar" "$pkgdir/usr/share/java/$pkgname/ditaa-${pkgver/./_}.jar"
-  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-  sed -i "s:VERSION:${pkgver/./_}:" "$pkgdir/usr/bin/$pkgname"
+  cd "$srcdir/$pkgname"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm755 "releases/$pkgname$pkgver.jar" \
+    "$pkgdir/usr/share/java/$pkgname/$pkgname-$pkgver.jar"
+  ln -s "/usr/share/java/$pkgname/$pkgname-$pkgver.jar" \
+    "$pkgdir/usr/share/java/$pkgname.jar"
+  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
 }