version 2.5.0.r80.g042326c-1

2 files changed, 37 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8928c4655f98..dc0f3de80244 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openvswitch-git
 	pkgdesc = Production Quality, Multilayer Open Virtual Switch
-	pkgver = 2.3.1.r55.g1cb39f3
+	pkgver = 2.5.0.r80.g042326c
 	pkgrel = 1
 	epoch = 1
 	url = http://openvswitch.org
@@ -11,10 +11,11 @@ pkgbase = openvswitch-git
 	makedepends = python2
 	makedepends = git
 	depends = openssl
+	depends = libcap-ng
 	optdepends = python2
 	provides = openvswitch
 	conflicts = openvswitch
-	source = openvswitch-git::git+https://github.com/openvswitch/ovs.git#branch=branch-2.3
+	source = openvswitch-git::git+https://github.com/openvswitch/ovs.git#branch=branch-2.5
 	source = openvswitch.tmpfiles
 	source = ovsdb-server.service
 	source = ovs-vswitchd.service
diff --git a/PKGBUILD b/PKGBUILD
index e1c51009b006..e4cd1d58dd14 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 123805 2014-12-12 10:28:49Z spupykin $
+# $Id: PKGBUILD 165400 2016-03-06 17:17:18Z pierre $
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Pedro Martinez-Julia (pedromj@um.es)
 # Contributor: Matt Monaco <net 0x01b dgbaley27>
 
 pkgname=openvswitch-git
-epoch=1
-pkgver=2.3.1.r55.g1cb39f3
+pkgver=2.5.0.r80.g042326c
 pkgrel=1
+epoch=1
 pkgdesc="Production Quality, Multilayer Open Virtual Switch"
 url="http://openvswitch.org"
 license=('APACHE')
 arch=(x86_64 i686)
-install="openvswitch.install"
-source=("$pkgname::git+https://github.com/openvswitch/ovs.git#branch=branch-2.3"
-        openvswitch.tmpfiles
-        ovsdb-server.service
-        ovs-vswitchd.service)
-depends=('openssl')
+install=openvswitch.install
+source=("$pkgname::git+https://github.com/openvswitch/ovs.git#branch=branch-2.5"
+	openvswitch.tmpfiles
+	ovsdb-server.service
+	ovs-vswitchd.service)
+depends=('openssl' 'libcap-ng')
 makedepends=('python2' 'git')
 optdepends=('python2')
 md5sums=('SKIP'
@@ -32,25 +32,35 @@ pkgver() {
 	git describe --long --tags | sed -E 's/^[^0-9]*//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd $pkgname
+  sed -i \
+    -e 's|$(sysconfdir)/bash_completion.d|/usr/share/bash-completion/completions|g' \
+    Makefile.am
+  sed -i -r -e 's,python,&2,;t' vtep/ovs-vtep
+  sed -i -r -e 's,python,&2,;t' ovn/utilities/ovn-docker-overlay-driver
+  sed -i -r -e 's,python,&2,;t' ovn/utilities/ovn-docker-underlay-driver
+}
+
 build() {
-	cd $pkgname
-	./boot.sh
-	./configure \
-	--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-rundir=/run/openvswitch \
-		--sbindir=/usr/bin \
-		PYTHON=/usr/bin/python2
-	make
+  cd $pkgname
+  ./boot.sh
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-rundir=/run/openvswitch \
+    --sbindir=/usr/bin \
+    PYTHON=/usr/bin/python2
+  make
 }
 
 package() {
   cd $pkgname
   make DESTDIR="$pkgdir" install
-	install -Dm0644 $srcdir/openvswitch.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/openvswitch.conf"
-	install -Dm0644 $srcdir/ovsdb-server.service "$pkgdir/usr/lib/systemd/system/ovsdb-server.service"
-	install -Dm0644 $srcdir/ovs-vswitchd.service "$pkgdir/usr/lib/systemd/system/ovs-vswitchd.service"
-	install -dm0755 "$pkgdir/etc/openvswitch"
-	rm -rf $pkgdir/run
+  install -Dm0644 $srcdir/openvswitch.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/openvswitch.conf"
+  install -Dm0644 $srcdir/ovsdb-server.service "$pkgdir/usr/lib/systemd/system/ovsdb-server.service"
+  install -Dm0644 $srcdir/ovs-vswitchd.service "$pkgdir/usr/lib/systemd/system/ovs-vswitchd.service"
+  install -dm0755 "$pkgdir/etc/openvswitch"
+  rm -rf $pkgdir/run
 }