[arch-commits] Commit in geoip/trunk (PKGBUILD pkgconfig.patch)

[Jürgen Hötzel]

    Date: Tuesday, July 15, 2014 @ 15:01:32
  Author: juergen
Revision: 216902

update to 1.6.2-1

Modified:
  geoip/trunk/PKGBUILD
Deleted:
  geoip/trunk/pkgconfig.patch

-----------------+
 PKGBUILD        |   26 ++++++++++----------------
 pkgconfig.patch |    8 --------
 2 files changed, 10 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-15 10:52:58 UTC (rev 216901)
+++ PKGBUILD	2014-07-15 13:01:32 UTC (rev 216902)
@@ -3,8 +3,8 @@
 # Contributor: Manolis Tzanidakis <manolis at archlinux.org>
 
 pkgname=geoip
-pkgver=1.5.1
-pkgrel=2
+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"
@@ -12,20 +12,17 @@
 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')
+source=(https://github.com/maxmind/${pkgname}-api-c/archive/v${pkgver}.tar.gz)
+sha256sums=('72562fc10792eea6cfa662d93ef40c6541b73619df8057a6e411144e671a9174')
 
 prepare() {
-  cd GeoIP-$pkgver
-  patch -Np1 -i ../pkgconfig.patch
+  cd geoip-api-c-$pkgver
+  autoreconf -vi
 }
 
 build() {
-  cd GeoIP-$pkgver
+  cd geoip-api-c-$pkgver
 
-  autoreconf -vi
   ./configure \
     --prefix=/usr \
     --mandir=/usr/share/man \
@@ -34,17 +31,14 @@
 }
 
 check() {
-  cd GeoIP-$pkgver
+  cd geoip-api-c-$pkgver
+  ln -sf /usr/share/GeoIP data
   make check
 }
 
 package() {
-  cd GeoIP-$pkgver
-
+  cd geoip-api-c-$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:

Deleted: pkgconfig.patch
===================================================================
--- pkgconfig.patch	2014-07-15 10:52:58 UTC (rev 216901)
+++ pkgconfig.patch	2014-07-15 13:01:32 UTC (rev 216902)
@@ -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@