summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD13
2 files changed, 10 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 78818f063944..6d8c5f394085 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
pkgbase = bdelta-git
pkgdesc = A tool to create diffs of binary files. A sophisticated sequence matching library bundled with a delta creator and patch tool.
pkgver = 0.3.1.d20130130.rg53e49e1.fefefilesize
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jjwhitney/BDelta
arch = i686
arch = x86_64
arch = arm
license = MPL
makedepends = git
- makedepends = python2
provides = bdelta=0.3.1.d20130130.rg53e49e1.fefefilesize
conflicts = bdelta
source = bdelta::git+https://github.com/jjwhitney/BDelta.git
- source = fefe-filesize-patch.patch::https://ptrace.fefe.de/bdelta.diff
+ source = fefefilesize.patch::https://ptrace.fefe.de/bdelta.diff
sha256sums = SKIP
sha256sums = 4e44a523b1c960c0ae428b822d700ca9610fe75a45c26e06679204a9cf19ea9c
diff --git a/PKGBUILD b/PKGBUILD
index dfebfee38238..6735ee7144c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname='bdelta'
pkgname="${_pkgname}-git"
pkgver=0.3.1.d20130130.rg53e49e1.fefefilesize
-pkgrel=1
+pkgrel=2
pkgdesc="A tool to create diffs of binary files. A sophisticated sequence matching library bundled with a delta creator and patch tool."
url='https://github.com/jjwhitney/BDelta'
arch=('i686' 'x86_64' 'arm')
@@ -14,7 +14,6 @@ depends=(
makedepends=(
"git"
- "python2"
)
optdepends=(
@@ -36,7 +35,7 @@ _giturl="https://github.com/jjwhitney/BDelta.git"
source=(
"${_pkgname}::git+${_giturl}"
- "fefe-filesize-patch.patch::https://ptrace.fefe.de/bdelta.diff"
+ "fefefilesize.patch::https://ptrace.fefe.de/bdelta.diff"
)
sha256sums=(
@@ -48,11 +47,15 @@ pkgver() {
_unpackeddir="${srcdir}/${_pkgname}"
cd "${_unpackeddir}"
- _ver="$(python2 version.py)"
+ _ver="$(git describe | sed 's|^v||')"
_rev="$(git describe --long | cut -d- -f3)"
_date="$(git log -n 1 --pretty=format:%ci | cut -d' ' -f1 | tr -d '-')"
- _extraver=".fefefilesize"
+ _extraver=""
+ for _patch in "${srcdir}"/*.patch; do
+ _extraver="${_extraver}.$(basename "${_patch}" .patch | tr -d '.-')"
+ done
+
if [ -z "${_ver}" ]; then
echo "$0: Error: Could not determine version." > /dev/stderr