From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 27 Dec 2013 23:55:53 +0000
Subject: Fri Dec 27 23:54:04 UTC 2013

---
 extra/python-geoip/PKGBUILD | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'extra/python-geoip')

diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD
index dc15efab0..ed1d33500 100644
--- a/extra/python-geoip/PKGBUILD
+++ b/extra/python-geoip/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 195467 2013-09-30 13:27:17Z jgc $
-# Maintainer:
+# $Id: PKGBUILD 199014 2013-11-06 11:10:37Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=('python2-geoip')
 pkgbase=python-geoip
 pkgver=1.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library"
 arch=('i686' 'x86_64')
 url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10"
@@ -21,6 +20,8 @@ build() {
 }
 
 package_python2-geoip() {
+  conflicts=('python-geoip<1.2.8')
+
   cd "GeoIP-Python-$pkgver"
   python2 setup.py install --root="$pkgdir" -O1
 }
-- 
cgit v1.2.3-54-g00ecf