diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-09-03 16:40:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-09-03 16:40:52 +0000 |
| commit | 4856ff2263fb45852fcd66b3783d61ce36b8c357 (patch) | |
| tree | 305610f541e104e234995c0279ff4816573ddacb | |
| parent | fff186bf2b72f7744766c879112f3c2488d1e024 (diff) | |
| download | aports-4856ff2263fb45852fcd66b3783d61ce36b8c357.tar.bz2 aports-4856ff2263fb45852fcd66b3783d61ce36b8c357.tar.xz | |
main/abuild: upgrade to 2.0_rc9
this includes feature for setting descrition/version on repos
| -rw-r--r-- | main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch | 29 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 9 |
2 files changed, 3 insertions, 35 deletions
diff --git a/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch b/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch deleted file mode 100644 index 4ca284d0..00000000 --- a/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f24e997104849f4a7cf9e2f73a3cc66a83624fcb Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 31 Aug 2009 09:12:04 +0000 -Subject: [PATCH] abuild: strip versions from dependencies when building recursively - ---- - abuild.in | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/abuild.in b/abuild.in -index b718a67..23c9f96 100755 ---- a/abuild.in -+++ b/abuild.in -@@ -712,7 +712,11 @@ depparse_aports() { - } - - deptrace() { -- local deps="$@" -+ local deps= i= -+ # strip versions from deps -+ for i in "$@"; do -+ deps="$deps ${i%[<>=]*}" -+ done - [ -z "$deps" ] && return 0 - ( depparse_aports - if [ -z "$upgrade" ]; then --- -1.6.4 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 108bab1d..fe691749 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,11 +1,10 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.0_rc8 -pkgrel=1 +pkgver=2.0_rc9 +pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 - 0001-abuild-strip-versions-from-dependencies-when-buildin.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev pkgconfig" @@ -13,11 +12,9 @@ license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../0001-abuild-strip-versions-from-dependencies-when-buildin.patch || return 1 make install DESTDIR="$pkgdir" install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="869b37120781d7295a5fdea783086d8b abuild-2.0_rc8.tar.bz2 -60d2a6c0b7b3a33ed4adf3c7154e5c01 0001-abuild-strip-versions-from-dependencies-when-buildin.patch" +md5sums="025f8dfa4114cf6432fdf52f14c2fc5c abuild-2.0_rc9.tar.bz2" |