From 6d39e8968314e59465a1738b2ecc6c33c5b6289e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 12 Jun 2015 07:21:53 +0000 Subject: main/abuild: upgrade to 2.23.0 --- ...r-inherit-provides-and-install_if-for-sub.patch | 30 ----------- ...ix-provides-and-install_if-in-subpackages.patch | 58 ---------------------- main/abuild/APKBUILD | 18 ++----- 3 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 main/abuild/0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch delete mode 100644 main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch diff --git a/main/abuild/0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch b/main/abuild/0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch deleted file mode 100644 index 971cec643b..0000000000 --- a/main/abuild/0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 563409ed82164663e08835ed07584337ce601773 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Mon, 8 Jun 2015 07:27:23 +0000 -Subject: [PATCH] abuild: clear inherit provides and install_if for subpackages - -Unexpected result will happen if subpackages inherits the provides or -install_if from main package. So we clear them. ---- - abuild.in | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/abuild.in b/abuild.in -index 9e6f43a..cb069f2 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -947,6 +947,11 @@ archcheck() { - - prepare_package() { - msg "Preparing ${subpkgname:+sub}package ${subpkgname:-$pkgname}..." -+ if [ -n "$subpkgname" ]; then -+ # the subpackages should not inherit those -+ provides="" -+ install_if="" -+ fi - stripbin - prepare_metafiles \ - && prepare_trace_rpaths \ --- -2.4.2 - diff --git a/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch b/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch deleted file mode 100644 index 275e52393e..0000000000 --- a/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0e58eeff8089c8c148c20a5e239d618095ec434f Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Thu, 11 Jun 2015 11:56:04 +0000 -Subject: [PATCH] abuild: fix provides and install_if in subpackages - -we need to clear provides set in global scope before splitting the -subpackages so the subpackage does not inherit main packages' provides. - -But at the same time, we must not clear the provides/install_if set in -the splitfunction itself. ---- - abuild.in | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/abuild.in b/abuild.in -index cb069f2..dc72d79 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -683,6 +683,15 @@ postcheck() { - return 0 - } - -+pre_split() { -+ if [ -z "$subpkgname" ]; then -+ return 0 -+ fi -+ # the subpackages should not inherit those form main package -+ provides="" -+ install_if="" -+} -+ - prepare_subpackages() { - local i - cd "$startdir" -@@ -692,7 +701,7 @@ prepare_subpackages() { - msg "Running split function $func..." - local dir="$pkgbasedir/${i%:*}" name="${i%:*}" - ( subpkgdir="$dir" subpkgname="$name" \ -- $0 $func prepare_package \ -+ $0 pre_split $func prepare_package \ - && postcheck "$dir" "$name" ) || return 1 - done - postcheck "$pkgdir" "$pkgname" || return 1 -@@ -947,11 +956,6 @@ archcheck() { - - prepare_package() { - msg "Preparing ${subpkgname:+sub}package ${subpkgname:-$pkgname}..." -- if [ -n "$subpkgname" ]; then -- # the subpackages should not inherit those -- provides="" -- install_if="" -- fi - stripbin - prepare_metafiles \ - && prepare_trace_rpaths \ --- -2.4.2 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 756c430816..a8ee6dc471 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa pkgname=abuild -pkgver=2.23.0_rc2 +pkgver=2.23.0 _ver=${pkgver%_git*} -pkgrel=2 +pkgrel=0 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -20,8 +20,6 @@ subpackages="apkbuild-cpan:cpan" options="suid" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz - 0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch - 0001-abuild-fix-provides-and-install_if-in-subpackages.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -58,12 +56,6 @@ cpan() { mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/ } -md5sums="fd07e1df3a8b3eac403d8b931ffd2cdd abuild-2.23.0_rc2.tar.xz -00bdd3304f7d89decc5d4b84e30a10b5 0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch -60460524b974ad082e722b8a5d65460a 0001-abuild-fix-provides-and-install_if-in-subpackages.patch" -sha256sums="efe6be2a16f55d851bd7125ed3a36f63ea03a546cf4a8cc847cfdb6a801c4bf0 abuild-2.23.0_rc2.tar.xz -d8744ecb58d86ecb40ee22edbdbcdba1e93cc8e331a9d98641446c08b307873a 0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch -c305ef06ba09e40a886674bc4e36c253e91910ed7818ea6544f82ccf345f580e 0001-abuild-fix-provides-and-install_if-in-subpackages.patch" -sha512sums="0b32c7ed6a59a57356a30767869d3e9aaa932aa55dd2982c102821a50a26c9e4a80415d768f24a228e34ecb450bfcbc2f88762fe95c5e218451611c946b6173a abuild-2.23.0_rc2.tar.xz -bb55aad137f2cf02f36ce57581a1dc00f6f70f5d4df1c3fcf509772757668abfb3e5e862e40f2b62fad707ec44278f33242f8d37a64473bc72423263df939fea 0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch -7269481a60a87bf2196c1a10ccfc6226d20c99e45a20e45f10aff2f174aaa2e5f92a88e374c15fbc76f3ffada49841bac3ad2208b78587a185048060aa3e5eb3 0001-abuild-fix-provides-and-install_if-in-subpackages.patch" +md5sums="864090a6016b3424d7b6bb31e84db3f0 abuild-2.23.0.tar.xz" +sha256sums="4cae7d7035955d23d1f29d4d0cd00ce225b300e6e809ff240101feea97aa7262 abuild-2.23.0.tar.xz" +sha512sums="50fc7649444079e5ba5552c2f4c57dedbdcd7b10727ed7b7bec8b4c85b37bbca1d76ab61bf3ab160520634e1742c3cd91fb294371bf653330ee0047337b6dfa9 abuild-2.23.0.tar.xz" -- cgit v1.2.3