[PATCH] main/bash: fix wrong version in bash.pc

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[PATCH] main/bash: fix wrong version in bash.pc

alpine-mips-patches <info@mobile-stream.com>

Details

Message ID: <20191113213314.4CC756C86B@mx12.valuehost.ru>
DKIM signature: missing

Download raw message

5 years ago

Patch: +4 -1

---
 main/bash/APKBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 6cba929678..fafd574d82 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -6,7 +6,7 @@ pkgver=5.0.11
 _patchlevel=${pkgver##*.}
 _myver=${pkgver%.*}
 _patchbase=${_myver/./}
-pkgrel=0
+pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
 url="https://www.gnu.org/software/bash/bash.html"
 arch="all"
@@ -55,6 +55,9 @@ prepare() {
 	done
 
 	default_prepare
+
+	# preventively set Version to please 'apk version --check'
+	sed -i "s/@PACKAGE_VERSION@/$pkgver/" "$builddir"/support/bash.pc.in
 }
 
 build() {
-- 
2.23.0

Kevin Daudt <kdaudt@alpinelinux.org>

Details

Message ID: <20191116203748.GC456781@alpha>
In-Reply-To: <20191113213314.4CC756C86B@mx12.valuehost.ru> (view parent)
DKIM signature: missing

Download raw message

5 years ago

On Wed, Nov 13, 2019 at 08:14:14PM +0000, alpine-mips-patches wrote:
> ---
>  main/bash/APKBUILD | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
> index 6cba929678..fafd574d82 100644
> --- a/main/bash/APKBUILD
> +++ b/main/bash/APKBUILD
> @@ -6,7 +6,7 @@ pkgver=5.0.11
>  _patchlevel=${pkgver##*.}
>  _myver=${pkgver%.*}
>  _patchbase=${_myver/./}
> -pkgrel=0
> +pkgrel=1
>  pkgdesc="The GNU Bourne Again shell"
>  url="https://www.gnu.org/software/bash/bash.html"
>  arch="all"
> @@ -55,6 +55,9 @@ prepare() {
>  	done
>  
>  	default_prepare
> +
> +	# preventively set Version to please 'apk version --check'
> +	sed -i "s/@PACKAGE_VERSION@/$pkgver/" "$builddir"/support/bash.pc.in
>  }
>  
>  build() {
> -- 
> 2.23.0
> 

This has been pushed. Thanks

~alpine/aports

[PATCH] main/bash: fix wrong version in bash.pc