Date: Thursday, May 17, 2012 @ 06:56:59 Author: guillaume Revision: 159176
upgpkg: apache-ant 1.8.3-2 Repackage following Arch guidelines #19440 Modified: apache-ant/trunk/PKGBUILD apache-ant/trunk/apache-ant.csh apache-ant/trunk/apache-ant.sh Deleted: apache-ant/trunk/ant_diagnostics.patch -----------------------+ PKGBUILD | 70 ++++++++++++++++++++++++++---------------------- ant_diagnostics.patch | 23 --------------- apache-ant.csh | 3 -- apache-ant.sh | 4 -- 4 files changed, 41 insertions(+), 59 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-05-17 10:12:16 UTC (rev 159175) +++ PKGBUILD 2012-05-17 10:56:59 UTC (rev 159176) @@ -2,53 +2,61 @@ # Maintainer: Guillaume ALAUX <[email protected]> # Contributor: Andrew Wright <[email protected]> # Contributor: Paul Mattal <[email protected]> - pkgname=apache-ant pkgver=1.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="A java-based build tool" arch=('any') +url="http://ant.apache.org/"; license=('APACHE') -url="http://ant.apache.org/"; depends=('java-environment') +makedepends=('java-environment' 'xalan-java' 'junit') optdepends=('junit: to jave junit on the classpath in javac tasks') -source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 - ${pkgname}.sh ${pkgname}.csh - ant_diagnostics.patch) -md5sums=('f5959aff4ab061cac37ff1f84f3b874a' - '593ee6ebd9b8ec321534a028e686880f' - '475b684eb8202c09cbb51496cd8ee1e0' - 'cbaab423be40a6e63f0fde901b91eb50') +source=(http://apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2 + ${pkgname}.sh + ${pkgname}.csh) +md5sums=('d7e0bdd538481b7c15dfb7fbcdd81b0e' + 'dbfa1e8dd4bab2f5821f5abe50835c83' + 'b3f67824043b6fb00667bb7a4007af42') -package() { - # install profile.d script - install -dm755 "${pkgdir}"/etc/profile.d - install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/ +_ant_home=/usr/share/${pkgname} - # Get the ANT_HOME env var - source "${srcdir}"/${pkgname}.sh +build() { + cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}"/${pkgname}-${pkgver} - install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib} + ln -s /usr/share/java/junit.jar lib/optional/junit.jar + sh build.sh dist +} - install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib - cp -Rp ./etc "${pkgdir}"/${ANT_HOME} +package() { + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}" - # Do not copy Windows .bat/.cmd files + install -dm755 ${pkgdir}/${_ant_home}/bin + cp -Rp etc ${pkgdir}/${_ant_home} find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ - -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \; + -exec install -m755 {} ${pkgdir}/${_ant_home}/bin \; - # symlink to junit so it's on the javac build path for ant - # matches behavior on ubuntu 9 and makes sense for compatibility + install -dm755 ${pkgdir}/usr/bin + ln -s ${_ant_home}/bin/ant ${pkgdir}/usr/bin/ant + + install -dm755 ${pkgdir}/usr/share/java/${pkgname} + install -m644 lib/*.jar ${pkgdir}/usr/share/java/${pkgname} + ln -s /usr/share/java/${pkgname} ${pkgdir}/${_ant_home}/lib + + # Symlink to junit so it's on the javac build path # http://bugs.archlinux.org/task/15229 - ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/ + # http://ant.apache.org/manual/install.html#optionalTasks + ln -sf ../junit.jar ${pkgdir}/usr/share/java/apache-ant/ # fix python2 path - sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py + sed -i 's|/usr/bin/python|/usr/bin/python2|' ${pkgdir}${_ant_home}/bin/runant.py - # The license says the NOTICE file should be redistributed for derivative - # works, so lets supply it. - cd "${srcdir}"/${pkgname}-${pkgver} - install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} - install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${pkgname} + # install profile.d script + install -dm755 ${pkgdir}/etc/profile.d + install -m755 "${srcdir}"/${pkgname}.{csh,sh} ${pkgdir}/etc/profile.d/ + + # License says NOTICE file should be redistributed for derivative works + cd ${srcdir}/${pkgname}-${pkgver} + install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgname} } Deleted: ant_diagnostics.patch =================================================================== --- ant_diagnostics.patch 2012-05-17 10:12:16 UTC (rev 159175) +++ ant_diagnostics.patch 2012-05-17 10:56:59 UTC (rev 159176) @@ -1,23 +0,0 @@ ---- a/src/main/org/apache/tools/ant/Diagnostics.java -+++ b/src/main/org/apache/tools/ant/Diagnostics.java -@@ -179,7 +179,10 @@ - * @param clazz the class to get the information from. - * @since Ant 1.8.0 - */ -- private static URL getClassLocation(Class clazz) { -+ private static URL getClassLocation(Class clazz) { -+ if (clazz.getProtectionDomain().getCodeSource() == null) { -+ return null; -+ } - return clazz.getProtectionDomain().getCodeSource().getLocation(); - } - -@@ -241,7 +244,7 @@ - } - Transformer transformer = null; - try { -- transformer = transformerFactory.newTransformer(); -+ transformer = transformerFactory.newTransformer(); - } catch (Exception e) { - // ignore - ignoreThrowable(e); Modified: apache-ant.csh =================================================================== --- apache-ant.csh 2012-05-17 10:12:16 UTC (rev 159175) +++ apache-ant.csh 2012-05-17 10:56:59 UTC (rev 159176) @@ -1,2 +1 @@ -setenv ANT_HOME /usr/share/java/apache-ant -setenv PATH ${PATH}:${ANT_HOME}/bin +setenv ANT_HOME /usr/share/apache-ant Modified: apache-ant.sh =================================================================== --- apache-ant.sh 2012-05-17 10:12:16 UTC (rev 159175) +++ apache-ant.sh 2012-05-17 10:56:59 UTC (rev 159176) @@ -1,3 +1 @@ -export ANT_HOME=/usr/share/java/apache-ant -export PATH=$PATH:$ANT_HOME/bin - +export ANT_HOME=/usr/share/apache-ant
