Update for 1.11.0 + build with snappy support

3 files changed, 12 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a47d840d92ac..4ac2619ed8f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,16 @@
 pkgbase = avro-cpp
 	pkgdesc = C++ implementation of the Apache Avro data serialization system
-	pkgver = 1.10.0
+	pkgver = 1.11.0
 	pkgrel = 1
 	url = https://avro.apache.org/
-	arch = i686
 	arch = x86_64
 	groups = avro
 	license = Apache
 	makedepends = boost
 	makedepends = cmake
-	makedepends = python2
+	makedepends = snappy
 	depends = boost-libs
-	source = https://www-us.apache.org/dist/avro/avro-1.10.0/cpp/avro-cpp-1.10.0.tar.gz
-	source = avro-cpp-python2.patch
-	sha256sums = ab016fa07c5759dc5ab8464214fc942833537f3419659a5df53ab7e3f1e809ec
-	sha256sums = 5d54151dd25e717a19109c97e68ce2a07d3b28b9fd3fb3ae1dc5df06b8600fd4
+	source = avro-cpp-1.11.0.tar.gz::https://codeload.github.com/apache/avro/tar.gz/release-1.11.0
+	sha256sums = c205140e7936d552286ba7131122a34e522d66f601ee912f272109d801f89773
 
 pkgname = avro-cpp
-
diff --git a/PKGBUILD b/PKGBUILD
index c7c48862e001..955fb0de083e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,21 @@
 # Maintainer: Andrew Nelless <andrew at nelless dot net>
 pkgname='avro-cpp'
-pkgver=1.10.0
+pkgver=1.11.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('x86_64')
 
 pkgdesc="C++ implementation of the Apache Avro data serialization system"
 url="https://avro.apache.org/"
 license=('Apache')
 groups=('avro')
 depends=('boost-libs')
-makedepends=('boost' 'cmake' 'python2')
+makedepends=('boost' 'cmake' 'snappy')
 
-source=("https://www-us.apache.org/dist/avro/avro-$pkgver/cpp/$pkgname-$pkgver.tar.gz"
-	$pkgname-python2.patch)
-sha256sums=('ab016fa07c5759dc5ab8464214fc942833537f3419659a5df53ab7e3f1e809ec'
-            '5d54151dd25e717a19109c97e68ce2a07d3b28b9fd3fb3ae1dc5df06b8600fd4')
-
-prepare() {
-    cd "$srcdir/$pkgname-$pkgver"
-    patch -p1 -i "$srcdir/$pkgname-python2.patch"
-}
+source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/apache/avro/tar.gz/release-$pkgver)
+sha256sums=('c205140e7936d552286ba7131122a34e522d66f601ee912f272109d801f89773')
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd "$srcdir/avro-release-$pkgver/lang/c++"
     mkdir build
     cd build
 
@@ -35,11 +28,11 @@ build() {
 }
 
 check() {
-    cd "$srcdir/$pkgname-$pkgver/build"
+    cd "$srcdir/avro-release-$pkgver/lang/c++/build"
     make test
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver/build"
+    cd "$srcdir/avro-release-$pkgver/lang/c++/build"
     make DESTDIR="$pkgdir/" install
 }
diff --git a/avro-cpp-python2.patch b/avro-cpp-python2.patch
deleted file mode 100644
index 79a7ad042a42..000000000000
--- a/avro-cpp-python2.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -uNr avro-cpp-1.8.0.orig/scripts/gen-cppcode.py avro-cpp-1.8.0/scripts/gen-cppcode.py
---- avro-cpp-1.8.0.orig/scripts/gen-cppcode.py	2016-02-04 13:28:36.564240294 +0000
-+++ avro-cpp-1.8.0/scripts/gen-cppcode.py	2016-02-04 13:35:33.354241323 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- 
- license = '''/**
-  * Licensed to the Apache Software Foundation (ASF) under one