[arch-commits] Commit in python-geoip/repos (4 files)

[Jan de Groot]

    Date: Wednesday, November 6, 2013 @ 12:10:37
  Author: jgc
Revision: 199014

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  python-geoip/repos/extra-i686/PKGBUILD
    (from rev 199013, python-geoip/trunk/PKGBUILD)
  python-geoip/repos/extra-x86_64/PKGBUILD
    (from rev 199013, python-geoip/trunk/PKGBUILD)
Deleted:
  python-geoip/repos/extra-i686/PKGBUILD
  python-geoip/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |   58 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   28 -----------------------
 extra-x86_64/PKGBUILD |   28 -----------------------
 3 files changed, 58 insertions(+), 56 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-11-06 11:10:28 UTC (rev 199013)
+++ extra-i686/PKGBUILD	2013-11-06 11:10:37 UTC (rev 199014)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=('python2-geoip')
-pkgbase=python-geoip
-pkgver=1.2.8
-pkgrel=2
-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"
-license=('LGPL')
-depends=('python2' 'geoip')
-source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz)
-sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73')
-
-build() {
-  cd "GeoIP-Python-$pkgver"
-  python2 setup.py build
-}
-
-package_python2-geoip() {
-  cd "GeoIP-Python-$pkgver"
-  python2 setup.py install --root="$pkgdir" -O1
-}
-
-# vim:set ts=2 sw=2 et:

Copied: python-geoip/repos/extra-i686/PKGBUILD (from rev 199013, python-geoip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-11-06 11:10:37 UTC (rev 199014)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+
+pkgname=('python2-geoip')
+pkgbase=python-geoip
+pkgver=1.2.8
+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"
+license=('LGPL')
+depends=('python2' 'geoip')
+source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz)
+sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73')
+
+build() {
+  cd "GeoIP-Python-$pkgver"
+  python2 setup.py build
+}
+
+package_python2-geoip() {
+  conflicts=('python-geoip<1.2.8')
+
+  cd "GeoIP-Python-$pkgver"
+  python2 setup.py install --root="$pkgdir" -O1
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-11-06 11:10:28 UTC (rev 199013)
+++ extra-x86_64/PKGBUILD	2013-11-06 11:10:37 UTC (rev 199014)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=('python2-geoip')
-pkgbase=python-geoip
-pkgver=1.2.8
-pkgrel=2
-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"
-license=('LGPL')
-depends=('python2' 'geoip')
-source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz)
-sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73')
-
-build() {
-  cd "GeoIP-Python-$pkgver"
-  python2 setup.py build
-}
-
-package_python2-geoip() {
-  cd "GeoIP-Python-$pkgver"
-  python2 setup.py install --root="$pkgdir" -O1
-}
-
-# vim:set ts=2 sw=2 et:

Copied: python-geoip/repos/extra-x86_64/PKGBUILD (from rev 199013, python-geoip/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-11-06 11:10:37 UTC (rev 199014)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+
+pkgname=('python2-geoip')
+pkgbase=python-geoip
+pkgver=1.2.8
+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"
+license=('LGPL')
+depends=('python2' 'geoip')
+source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz)
+sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73')
+
+build() {
+  cd "GeoIP-Python-$pkgver"
+  python2 setup.py build
+}
+
+package_python2-geoip() {
+  conflicts=('python-geoip<1.2.8')
+
+  cd "GeoIP-Python-$pkgver"
+  python2 setup.py install --root="$pkgdir" -O1
+}
+
+# vim:set ts=2 sw=2 et: