summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-06-15 02:07:30 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-06-15 02:07:30 +0000
commit1646ba51463829350eaf8d6b78f1fa9e5f83e967 (patch)
tree94975faa6a33c0e4e8b145a1237103c269d01760
parente446ae4ed1741bfd70d0e19487246ccf1593ffe1 (diff)
parent5b67bb2f8e3a641e05f99367484c663a7167fad4 (diff)
downloadpackages-1646ba51463829350eaf8d6b78f1fa9e5f83e967.tar.gz
packages-1646ba51463829350eaf8d6b78f1fa9e5f83e967.tar.bz2
packages-1646ba51463829350eaf8d6b78f1fa9e5f83e967.tar.xz
packages-1646ba51463829350eaf8d6b78f1fa9e5f83e967.zip
Merge branch 'procps-versioning' into 'master'
system/procps: stupid dumb GNU git versioning idiocy fix, use better gitlab URL See merge request !243
-rw-r--r--system/procps/APKBUILD13
1 files changed, 6 insertions, 7 deletions
diff --git a/system/procps/APKBUILD b/system/procps/APKBUILD
index 4cfe3e38e..f16c674ae 100644
--- a/system/procps/APKBUILD
+++ b/system/procps/APKBUILD
@@ -10,17 +10,15 @@ makedepends_build="autoconf automake libtool gettext-tiny"
makedepends_host="ncurses-dev utmps-dev"
checkdepends="dejagnu"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libproc"
-source="$pkgname-$pkgver.tar.gz::https://gitlab.com/procps-ng/$pkgname/repository/archive.tar.gz?ref=v$pkgver
+source="https://gitlab.com/procps-ng/procps/-/archive/v$pkgver/procps-v$pkgver.tar.bz2
0001-pt_BR-fix-translation-error.patch
use-utmpx.patch"
+builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
- # NOTE: Name of the tarball's top-level directory contains SHA1.
- ln -fs $pkgname-v$pkgver-* "$builddir"
-
- default_prepare
-
cd "$builddir"
+ default_prepare
+ printf "$pkgver" > .tarball-version
./autogen.sh
}
@@ -28,6 +26,7 @@ build() {
cd "$builddir"
export LIBS="$LIBS -lutmps -lskarnet"
+ export VERSION="$pkgver"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -75,6 +74,6 @@ libproc() {
mv "$pkgdir"/lib "$subpkgdir"/
}
-sha512sums="61017c98827cb9c325fe51f74e9e912cb6b130abdc69742678968a45f4a6f1f033bac4adaed19908197bc97a7426a7a27e04be361edb74ebff3dc0383b71fa53 procps-3.3.15.tar.gz
+sha512sums="0c50ef0f19305f1b53089f20f29d8058b23dde20983dbed759ea0fe8128b22518fd137dec389c3630988b6bbf0cf485418a328153b89ec4e1dfbf6d89322c064 procps-v3.3.15.tar.bz2
d63c8df42f74f08f19276a8f4d0260624313801b138aa2b430a105328c3230427d3e81bc016ddde9fc995575e97961a3be8e4f5ded34c874cc613c645605a976 0001-pt_BR-fix-translation-error.patch
6683b94f64848721ebce8254461fbd70a3efd048bf9579c5bbe298bd1ec00594c05640327f0e03475e583607f1f7405139b93fc9f06592d5593174cbf6d4119f use-utmpx.patch"