summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-12-26 09:05:14 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-12-26 09:05:14 -0200
commitf89504d39c26821c0c0caecec10c4580fcce787b (patch)
tree4ca1aa5a5e521388cb27db3ec38322455f921138
parent5df4cd9ac9846c70282c039e21b7f6f0eff1554c (diff)
parent6e7aa928eef64893677ccd85e7c81e26b557ab62 (diff)
downloadabslibre-f89504d39c26821c0c0caecec10c4580fcce787b.tar.gz
abslibre-f89504d39c26821c0c0caecec10c4580fcce787b.tar.bz2
abslibre-f89504d39c26821c0c0caecec10c4580fcce787b.zip
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--java/java-json-android/PKGBUILD4
-rw-r--r--java/junit/PKGBUILD14
2 files changed, 6 insertions, 12 deletions
diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
index a5ec08c9f..7a9113529 100644
--- a/java/java-json-android/PKGBUILD
+++ b/java/java-json-android/PKGBUILD
@@ -10,14 +10,14 @@ pkgver=${_pkgver//_/.}
provides=(java-json)
conflicts=(java-json)
-pkgrel=2
+pkgrel=3
arch=(any)
depends=(java-runtime)
makedepends=(java-environment junit)
source=("libre://android-libcore-$_pkgver.tar.gz")
-md5sums=('367769bb9d7fe571ff4e1e82b99e99ed')
+md5sums=('546a4614552615a12f45b62db27acddf')
mkdepends=(git)
mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}")
diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
index 5e466a029..04dbcb2ac 100644
--- a/java/junit/PKGBUILD
+++ b/java/junit/PKGBUILD
@@ -7,24 +7,18 @@ pkgdesc="Automated testing framework for Java"
url="http://www.junit.org/"
license=('CPL')
-pkgrel=3.1
+pkgrel=3.2
arch=('any')
depends=('java-runtime' 'java-hamcrest')
makedepends=('apache-ant' 'jakarta-oro' 'jh')
source=("libre://$pkgname-$pkgver.tar.gz")
-md5sums=('47c8879e05effb2ab98461c43243cc65')
+md5sums=('cdaa9856761201de81a61aecb8cfcc9c')
-mksource=("$pkgname::git://github.com/junit-team/junit.git#tag=r$pkgver")
+mksource=("$pkgname-$pkgver::git://github.com/junit-team/junit.git#tag=r$pkgver")
mkmd5sums=('SKIP')
mksource() {
- cd "${srcdir}"p
- if [[ -d $pkgname ]]; then
- rm -rf "$pkgname"-*
- mv "$pkgname" "$pkgname-$pkgver"
- fi
-
- cd "${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
find . -name '*.jar' -delete
}