diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-04-29 20:05:50 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-04-29 20:05:50 +0000 |
| commit | e962598dec75a0bd386cfa410d4db1bf359c4309 (patch) | |
| tree | 7a25da858327082546189ce368d4304049a7769f /main/abuild | |
| parent | 1abc8b3248ef6cba929afa857167ec7013f11dec (diff) | |
| download | aports-e962598dec75a0bd386cfa410d4db1bf359c4309.tar.bz2 aports-e962598dec75a0bd386cfa410d4db1bf359c4309.tar.xz | |
main/abuild: upgrade to 3.4.0_rc2
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-Revert-abuild-unset-depends-for-subpackages.patch | 36 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 8 |
2 files changed, 3 insertions, 41 deletions
diff --git a/main/abuild/0001-Revert-abuild-unset-depends-for-subpackages.patch b/main/abuild/0001-Revert-abuild-unset-depends-for-subpackages.patch deleted file mode 100644 index c2fac24d76..0000000000 --- a/main/abuild/0001-Revert-abuild-unset-depends-for-subpackages.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 745e53620b54025df94d206668f76429b0955b1f Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 5 Apr 2019 13:13:24 +0000 -Subject: [PATCH] Revert "abuild: unset depends for subpackages" - -Apparently there are many packages that does soemthing like: - -subpackages="$pkgname-foo:_foo" - -_foo() { - depends="$depends something-else" -} - -and thus depend on the previous behavior. We need to revert and plan -this better. - -This reverts commit 8fbbffd201a28a06804c7f6d3a2b5cd948c6ce07. ---- - abuild.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index d19d12e..1222cb7 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -756,7 +756,6 @@ pre_split() { - return 0 - fi - # the subpackages should not inherit those from main package -- depends="" - provides="" - install_if="" - } --- -2.21.0 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 7cda98a9c3..a018bb6360 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abuild -pkgver=3.4.0_rc1 +pkgver=3.4.0_rc2 _ver=${pkgver%_git*} -pkgrel=2 +pkgrel=0 pkgdesc="Script to build Alpine Packages" url="https://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -21,7 +21,6 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch options="suid !check" pkggroups="abuild" source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz - 0001-Revert-abuild-unset-depends-for-subpackages.patch " builddir="$srcdir/$pkgname-$_ver" @@ -69,5 +68,4 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="97b6c12d3bc44794eae966d950ad0a2f915651fce76ea39c1c97700d04061be910a5bd66e9cff63bd1aaf6991ecb4a6eb9eb8477c4d12b2501666402d50b0c4b abuild-3.4.0_rc1.tar.xz -86bda138a5ab4ecd6fad8a0e8b3722d2bdbcbf2661682ce05b0fc16386ca3bddd2076c63079fb168b2d0e09d6037c38bcca4c4568fdc1fa590b4f66d979145bf 0001-Revert-abuild-unset-depends-for-subpackages.patch" +sha512sums="b63b4e8cdb16d29f012830f7fb6eb4450d813b434166bf911ac257348d36d3d08326aebe076e64358557eebc962a4241237e82e2be3be3e6ee595751498f3af8 abuild-3.4.0_rc2.tar.xz" |