[arch-commits] Commit in c-ares/repos (3 files)

[Eric Belanger]

    Date: Wednesday, October 8, 2008 @ 16:22:58
  Author: eric
Revision: 14637

fixing svn conflict

Modified:
  c-ares/repos/extra-x86_64/	(properties)
  c-ares/repos/extra-x86_64/LICENSE
  c-ares/repos/extra-x86_64/PKGBUILD

----------+
 LICENSE  |    1 +
 PKGBUILD |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)


Property changes on: c-ares/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /c-ares/trunk:1
   + /c-ares/trunk:1-14634

Modified: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE	2008-10-08 20:22:52 UTC (rev 14636)
+++ extra-x86_64/LICENSE	2008-10-08 20:22:58 UTC (rev 14637)
@@ -1,4 +1,5 @@
 /* Copyright 1998 by the Massachusetts Institute of Technology.
+ * Copyright (C) 2007-2008 by Daniel Stenberg
  *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-08 20:22:52 UTC (rev 14636)
+++ extra-x86_64/PKGBUILD	2008-10-08 20:22:58 UTC (rev 14637)
@@ -2,22 +2,22 @@
 # Maintainer: Jeff Mickey <jeff at archlinux.org>
 # Maintainer: Vinay S Shastry <vinayshastry at gmail.com>
 pkgname=c-ares
-pkgver=1.5.1
+pkgver=1.5.3
 pkgrel=1
 pkgdesc="c-ares is a C library that performs DNS requests and name resolves asynchronously"
 url="http://daniel.haxx.se/projects/c-ares/"
 arch=('i686' 'x86_64')
 license=('MIT')
 depends=()
-source=(http://daniel.haxx.se/projects/c-ares/$pkgname-$pkgver.tar.gz)
 options=('!libtool')
+source=(http://daniel.haxx.se/projects/c-ares/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('ec202543a8cb86647f52e1ed4b5c0b37' '8d3b474b934eff15d006a754b7e45216')
+sha1sums=('885fa291d7ae7d825c732b38ae147d5f83cc1904' '07d7104fc2d16e9232bd89e5a2fe28735444a6c3')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=$startdir/pkg install
+  install -D -m644 ../LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 }
-
-md5sums=('f39acb8033391b0afebf367d314bed36')
-sha1sums=('f372187931789c572d134e6362eaf39f44d4dbc1')