updated on Wed Dec 10 00:00:10 UTC 2014

2 files changed, 4 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4f9f8fdd7d8..ce2878f9040b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = android-apktool-git
 	pkgdesc = a tool for reengineering Android apk files
-	pkgver = 2.0.0.RC2.g02b5c7c
+	pkgver = 2.0.0.RC3
 	pkgrel = 1
 	url = https://code.google.com/p/android-apktool/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index a1f152d0dab1..fa13ad598b80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=android-apktool-git
 _gitname=Apktool
 _gitbranch=master
 _gitauthor=iBotPeaches
-pkgver=2.0.0.RC2.g02b5c7c
+pkgver=2.0.0.RC3
 pkgrel=1
 pkgdesc="a tool for reengineering Android apk files"
 arch=('i686' 'x86_64')
@@ -19,14 +19,13 @@ sha512sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$_gitname"
-  # This is a heck of a line, but I found it way the only way of getting the version number properly
-  printf "$(grep "def apktoolversion_major" build.gradle | sed "s/.*'\(.*\)'.*/\1/").$(grep "def apktoolversion_minor" build.gradle | sed "s/.*'\(.*\)'.*/\1/").$(git describe | sed -n -e 's/^.*-//p')"
+  git describe | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/v//'
 }
 
 build() {
   pacman -Qs openjdk &> /dev/null && printf "\033[31;1mWarning, there has been issues in the past with OpenJDK and apktool. Please install Oracle's JDK before marking the package as broken.\n\033[0m\n"
 
-  # Ideally this should be fixed in the build script of apktool and not here; without it, aapt cannot be found
+  # aapt cannot be found without this line
   PATH="/opt/android-sdk/build-tools/$(ls -1 /opt/android-sdk/build-tools/ | head -1):$PATH"
   
   cd "$srcdir/$_gitname"