java-qdox-1.12.1-2: rebuild

1 files changed, 21 insertions, 18 deletions

diff --git a/pcr/java-qdox/PKGBUILD b/pcr/java-qdox/PKGBUILD
index 1b7bd2ef6..5847371ef 100644
--- a/pcr/java-qdox/PKGBUILD
+++ b/pcr/java-qdox/PKGBUILD
@@ -3,27 +3,26 @@
 _pkgname=qdox
 pkgname=java-${_pkgname}
 pkgver=1.12.1
-pkgrel=1
-pkgdesc="Quickly parses declarations and Javadoc from Java source"
+pkgrel=2
+pkgdesc="A high speed, small footprint parser for extracting class/interface/method definitions from source files complete with JavaDoc @tags"
 arch=('any')
 url="http://qdox.codehaus.org"
 license=('APACHE')
 depends=('java-runtime')
 makedepends=('apache-ant' 'jh' 'junit')
-source=("http://repo1.maven.org/maven2/com/thoughtworks/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}-sources.jar"
-        "http://repo1.maven.org/maven2/com/thoughtworks/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.pom")
+source=("http://repo1.maven.org/maven2/com/thoughtworks/${_pkgname}/${_pkgname}/$pkgver/${_pkgname}-$pkgver-sources.jar"
+        "http://repo1.maven.org/maven2/com/thoughtworks/${_pkgname}/${_pkgname}/$pkgver/${_pkgname}-$pkgver.pom")
 md5sums=('153ec1212a9fcf7986cd61909c05fd5b'
          'ac2b4b3cfe6d594797940ba73f140cf7')
 
 prepare() {
-  cd ${srcdir}
+  cd $srcdir
   mkdir -p "build/classes"
 }
 
 build() {
-  cd ${srcdir}
-
-  CLASSPATH="/opt/apache-ant/lib/ant.jar:/usr/share/java/junit.jar"
+  cd $srcdir
+  CLASSPATH="/usr/share/apache-ant/lib/ant.jar:/usr/share/java/junit.jar"
   javac -classpath $CLASSPATH -d "build/classes" $(find . -name \*.java)
   javadoc -classpath $CLASSPATH -d "build/javadoc" -sourcepath . -subpackages com
 
@@ -31,18 +30,22 @@ build() {
 }
 
 package() {
-  cd ${srcdir}
+  cd $srcdir
 
   # Install documentation
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "build/javadoc" "${pkgdir}/usr/share/doc/${pkgname}"
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r "build/javadoc" "$pkgdir/usr/share/doc/$pkgname"
 
   # Install Maven artifacts
-  export DESTDIR=${pkgdir}
-  jh mvn-install "com.thoughtworks.qdox" ${_pkgname} ${pkgver} \
-    "${srcdir}/${_pkgname}-${pkgver}.pom" \
-    "${srcdir}/${_pkgname}.jar" \
-    "${_pkgname}.jar"
+  export DESTDIR=$pkgdir
+  jh mvn-install "com.thoughtworks.qdox" ${_pkgname} $pkgver \
+    "${_pkgname}-$pkgver.pom" \
+    "${_pkgname}.jar" \
+    "${_pkgname}-$pkgver.jar"
+  ln -s "/usr/share/java/${_pkgname}-$pkgver.jar" \
+    "$pkgdir/usr/share/java/${_pkgname}.jar"
+
+  install -d "$pkgdir/usr/share/java/${_pkgname}"
   ln -s "/usr/share/java/${_pkgname}.jar" \
-    "${pkgdir}/usr/share/java/${_pkgname}-${pkgver}.jar"
-}
\ No newline at end of file
+    "$pkgdir/usr/share/java/${_pkgname}/${_pkgname}.jar"
+}