[arch-commits] Commit in geoip/repos/extra-i686 (PKGBUILD PKGBUILD pkgconfig.patch)

[Jürgen Hötzel]

    Date: Tuesday, July 15, 2014 @ 15:22:34
  Author: juergen
Revision: 216905

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

Added:
  geoip/repos/extra-i686/PKGBUILD
    (from rev 216904, geoip/trunk/PKGBUILD)
Deleted:
  geoip/repos/extra-i686/PKGBUILD
  geoip/repos/extra-i686/pkgconfig.patch

-----------------+
 PKGBUILD        |   95 +++++++++++++++++++++++++-----------------------------
 pkgconfig.patch |    8 ----
 2 files changed, 45 insertions(+), 58 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-15 13:18:16 UTC (rev 216904)
+++ PKGBUILD	2014-07-15 13:22:34 UTC (rev 216905)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Manolis Tzanidakis <manolis at archlinux.org>
-
-pkgname=geoip
-pkgver=1.5.1
-pkgrel=2
-pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-arch=('i686' 'x86_64')
-url="http://www.maxmind.com/app/c"
-license=('GPL')
-depends=('zlib' 'geoip-database')
-backup=('etc/geoip/GeoIP.conf')
-options=('!emptydirs')
-source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz 
-        pkgconfig.patch)
-sha256sums=('ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731'
-            '64a6a608beabdc553019237d7da808dc234f760c21040036b2f589eaebba5d10')
-
-prepare() {
-  cd GeoIP-$pkgver
-  patch -Np1 -i ../pkgconfig.patch
-}
-
-build() {
-  cd GeoIP-$pkgver
-
-  autoreconf -vi
-  ./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc/geoip
-  make
-}
-
-check() {
-  cd GeoIP-$pkgver
-  make check
-}
-
-package() {
-  cd GeoIP-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # country database is provided by geoip-database
-  rm "$pkgdir/usr/share/GeoIP/GeoIP.dat"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: geoip/repos/extra-i686/PKGBUILD (from rev 216904, geoip/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-07-15 13:22:34 UTC (rev 216905)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Manolis Tzanidakis <manolis at archlinux.org>
+
+pkgname=geoip
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="Non-DNS IP-to-country resolver C library & utils"
+arch=('i686' 'x86_64')
+url="http://www.maxmind.com/app/c"
+license=('GPL')
+depends=('zlib' 'geoip-database')
+makedepends=('autoconf' 'libtool')
+backup=('etc/geoip/GeoIP.conf')
+options=('!emptydirs')
+source=(https://github.com/maxmind/${pkgname}-api-c/archive/v${pkgver}.tar.gz)
+sha256sums=('72562fc10792eea6cfa662d93ef40c6541b73619df8057a6e411144e671a9174')
+
+prepare() {
+  cd geoip-api-c-$pkgver
+  autoreconf -vi
+}
+
+build() {
+  cd geoip-api-c-$pkgver
+
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --sysconfdir=/etc/geoip
+  make
+}
+
+check() {
+  cd geoip-api-c-$pkgver
+  ln -sf /usr/share/GeoIP data
+  make check
+}
+
+package() {
+  cd geoip-api-c-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: pkgconfig.patch
===================================================================
--- pkgconfig.patch	2014-07-15 13:18:16 UTC (rev 216904)
+++ pkgconfig.patch	2014-07-15 13:22:34 UTC (rev 216905)
@@ -1,8 +0,0 @@
---- GeoIP-1.5.1/geoip.pc.in.orig	2013-03-23 02:26:09.000000000 +0000
-+++ GeoIP-1.5.1/geoip.pc.in	2013-09-23 12:04:07.441555775 +0000
-@@ -1,4 +1,5 @@
- prefix=@prefix@
-+exec_prefix=${prefix}
- libdir=@libdir@
- includedir=@includedir@
- datadir=@datarootdir@