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

[Jan de Groot]

    Date: Thursday, April 24, 2008 @ 18:14:40
  Author: jgc
Revision: 930

Resolve conflict

Modified:
  libnl/repos/extra-i686/	(properties)
  libnl/repos/extra-i686/PKGBUILD
Deleted:
  libnl/repos/extra-i686/libnl-1.0_pre6-amd64-typedef.diff

-----------------------------------+
 PKGBUILD                          |   17 ++++++++---------
 libnl-1.0_pre6-amd64-typedef.diff |   12 ------------
 2 files changed, 8 insertions(+), 21 deletions(-)


Property changes on: libnl/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /libnl/trunk:1
   + /libnl/trunk:1-912

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-24 21:49:13 UTC (rev 929)
+++ extra-i686/PKGBUILD	2008-04-24 22:14:40 UTC (rev 930)
@@ -1,21 +1,20 @@
 # $Id$
-# Maintainer: <arjan at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: William Rea <sillywilly at gmail.com>
 pkgname=libnl
-pkgver=1.0pre6
+pkgver=1.1
 pkgrel=1
 pkgdesc="Library for applications dealing with netlink sockets"
 arch=('i686' 'x86_64')
 url="http://people.suug.ch/~tgr/libnl"
 license=('GPL')
 depends=('glibc')
-source=(http://people.suug.ch/~tgr/$pkgname/files/$pkgname-1.0-pre6.tar.gz \
-	libnl-1.0_pre6-amd64-typedef.diff)
-md5sums=('0f57cb7085dc27e054691bff858613c9' '6254441d5e718e6b92341ed0513f902b')
+source=(http://people.suug.ch/~tgr/${pkgname}/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('ae970ccd9144e132b68664f98e7ceeb1')
+
 build() {
-  cd $startdir/src/libnl-1.0-pre6
-  [ "$CARCH" = "x86_64" ] && (patch -Np2 -i $startdir/src/libnl-1.0_pre6-amd64-typedef.diff || return 1)
-  ./configure --prefix=/usr
+  cd ${startdir}/src/libnl-${pkgver}
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 }

Deleted: extra-i686/libnl-1.0_pre6-amd64-typedef.diff
===================================================================
--- extra-i686/libnl-1.0_pre6-amd64-typedef.diff	2008-04-24 21:49:13 UTC (rev 929)
+++ extra-i686/libnl-1.0_pre6-amd64-typedef.diff	2008-04-24 22:14:40 UTC (rev 930)
@@ -1,12 +0,0 @@
---- /libnl-1.0_pre6.orig/include/netlink-local.h 
-+++ /libnl-1.0_pre6/include/netlink-local.h 
-@@ -34,7 +34,8 @@
- typedef uint16_t	__u16;
- typedef uint32_t	__u32;
- typedef int32_t		__s32;
--typedef uint64_t	__u64;
-+typedef unsigned long long __u64;
-+
- 
- /* local header copies */
- #include <linux/if.h>