summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2015-02-07 11:22:21 -0600
committerDoug Newgard2015-02-07 11:22:21 -0600
commit9c6dcf3cfe9cc09a6209f13418d6916dc5c1957b (patch)
treee4092ee7ce4f333c8c09da769a5099bbc8c316dc
parent253c128e2dd7be4ec853f0d7a03f6fd42b9d6333 (diff)
downloadaur-9c6dcf3cfe9cc09a6209f13418d6916dc5c1957b.tar.gz
New version format in configure.ac
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD13
2 files changed, 8 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 722e9a629b42..f061bbbaf61a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ephoto-git
pkgdesc = A light image viewer based on EFL
- pkgver = 0.1.1.480.f3cff05
+ pkgver = 0.0.1.r527.8138051
pkgrel = 1
url = http://www.enlightenment.org
install = ephoto.install
@@ -9,7 +9,8 @@ pkgbase = ephoto-git
license = BSD
makedepends = git
depends = elementary
- provides = ephoto=0.1.1.480.f3cff05
+ depends = desktop-file-utils
+ provides = ephoto=0.0.1.r527.8138051
conflicts = ephoto
source = git://git.enlightenment.org/apps/ephoto.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 75ba991e2b7c..f023a0c528e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
_pkgname=ephoto
pkgname=$_pkgname-git
-pkgver=0.1.1.480.f3cff05
+pkgver=0.0.1.r527.8138051
pkgrel=1
pkgdesc="A light image viewer based on EFL"
arch=('i686' 'x86_64')
url="http://www.enlightenment.org"
license=('BSD')
-depends=('elementary')
+depends=('elementary' 'desktop-file-utils')
makedepends=('git')
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
@@ -20,13 +20,10 @@ sha256sums=('SKIP')
pkgver() {
cd "$srcdir/$_pkgname"
- for _i in v_maj v_min v_mic; do
- local v_ver=$v_ver.$(grep -m1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*")
- done
+ local efl_version=$(grep -m1 EFL_VERSION configure.ac | awk -F [][] '{print $2 "." $4 "." $6}')
+ efl_version=$(awk -F , -v efl_version=${efl_version%.} '/^AC_INIT/ {gsub(/efl_version/, efl_version); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
- v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
-
- printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+ printf "$efl_version.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
build() {