Fix package.xml version

And drop unused openssl-1.0, which is not necessary since
https://android-review.googlesource.com/c/381513

3 files changed, 17 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de5265f0d366..d1ae91182122 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = android-sdk-cmake
 	pkgdesc = CMake from Google Android SDK
 	pkgver = 3.6.4111459
-	pkgrel = 1
+	pkgrel = 2
 	url = http://developer.android.com/sdk/index.html
 	install = android-sdk-cmake.install
 	arch = x86_64
 	license = custom:android-sdk-license
 	makedepends = libxml2
 	depends = bash
-	depends = openssl-1.0
 	noextract = cmake-3.6.4111459-linux-x86_64.zip
 	options = !strip
 	source = https://dl-ssl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip
-	source = package.xml
+	source = package.xml.in
 	sha1sums = 71c539b9c33f0943e9ad6251fea0b161c0b70782
-	sha1sums = 499d480538d4077f8e0c8c22b3bcdf809daf18ac
+	sha1sums = 5ca8c4e61ee3a3294865afbd5d16e83662871e06
 
 pkgname = android-sdk-cmake
 
diff --git a/PKGBUILD b/PKGBUILD
index c373e41e3fdd..456fe95dd497 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,24 @@
 # Maintainer: Yen Chi Hsuan <yan12125 at gmail dot com>
 
 pkgname=android-sdk-cmake
-pkgver=3.6.4111459
-pkgrel=1
+_major=3
+_minor=6
+_micro=4111459
+pkgver=$_major.$_minor.$_micro
+pkgrel=2
 pkgdesc='CMake from Google Android SDK'
 arch=('x86_64')
 url="http://developer.android.com/sdk/index.html"
 license=('custom:android-sdk-license')
-depends=('bash' 'openssl-1.0')
+depends=('bash')
 makedepends=('libxml2') # xmllint
 source=("https://dl-ssl.google.com/android/repository/cmake-${pkgver}-linux-x86_64.zip"
-        package.xml)
+        package.xml.in)
 noextract=("cmake-${pkgver}-linux-x86_64.zip")
 install=android-sdk-cmake.install
 # sha1sum is from https://dl.google.com/android/repository/repository2-1.xml
 sha1sums=('71c539b9c33f0943e9ad6251fea0b161c0b70782'
-          '499d480538d4077f8e0c8c22b3bcdf809daf18ac')
+          '5ca8c4e61ee3a3294865afbd5d16e83662871e06')
 options=('!strip')
 
 prepare() {
@@ -25,6 +28,11 @@ prepare() {
     bsdtar -x -f ../cmake-$pkgver-linux-x86_64.zip
 }
 
+build() {
+    cd "$srcdir"
+    sed "s#%MAJOR%#$_major#g;s#%MINOR%#$_minor#g;s#%MICRO%#$_micro#g" package.xml.in > package.xml
+}
+
 package() {
   install -Ddm755 "$pkgdir"/opt/android-sdk/cmake
   cp -dr --no-preserve=ownership "$srcdir"/cmake-pkg "$pkgdir"/opt/android-sdk/cmake/$pkgver
diff --git a/package.xml b/package.xml.in
index aa4de7301fe5..cbf591318642 100644
--- a/package.xml
+++ b/package.xml.in
@@ -138,4 +138,4 @@ This is the Android Software Development Kit License Agreement
 14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
 
 
-November 20, 2015</license><localPackage path="cmake;3.6.3155560" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns5:genericDetailsType"/><revision><major>3</major><minor>6</minor><micro>3155560</micro></revision><display-name>CMake 3.6.3155560</display-name><uses-license ref="android-sdk-license"/></localPackage></ns2:repository>
\ No newline at end of file
+November 20, 2015</license><localPackage path="cmake;%MAJOR%.%MINOR%.%MICRO%" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns5:genericDetailsType"/><revision><major>%MAJOR%</major><minor>%MINOR%</minor><micro>%MICRO%</micro></revision><display-name>CMake %MAJOR%.%MINOR%.%MICRO%</display-name><uses-license ref="android-sdk-license"/></localPackage></ns2:repository>