[arch-commits] CVS update of extra/lib/libnetworkmanager (3 files)

Jan de Groot jgc at archlinux.org
Thu Apr 26 13:13:18 EDT 2007


    Date: Thursday, April 26, 2007 @ 13:13:18
  Author: jgc
    Path: /home/cvs-extra/extra/lib/libnetworkmanager

Modified: PKGBUILD (1.6 -> 1.7)
 Removed: configure-no-makedepends.patch (1.1)
          libnm_glib-dbus-0.92.patch (1.1)

upgpkg: libnetworkmanager 0.6.5-1
Add Networkmanager header files to lib package, remove patch that removes the need for makedepends, it is not maintainable, we need these packages anyways to build networkmanager


--------------------------------+
 PKGBUILD                       |   34 +++++++----------
 configure-no-makedepends.patch |   75 ---------------------------------------
 libnm_glib-dbus-0.92.patch     |   25 -------------
 3 files changed, 15 insertions(+), 119 deletions(-)


Index: extra/lib/libnetworkmanager/PKGBUILD
diff -u extra/lib/libnetworkmanager/PKGBUILD:1.6 extra/lib/libnetworkmanager/PKGBUILD:1.7
--- extra/lib/libnetworkmanager/PKGBUILD:1.6	Thu Sep 28 12:49:45 2006
+++ extra/lib/libnetworkmanager/PKGBUILD	Thu Apr 26 13:13:18 2007
@@ -1,36 +1,32 @@
-# $Id: PKGBUILD,v 1.6 2006/09/28 16:49:45 jgc Exp $
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.7 2007/04/26 17:13:18 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
 # Contributor: Tor Krill <tor at krill.nu>
 # Contributor: Will Rea <sillywilly at gmail.com>
 # Contributor: Valentine Sinitsyn <e_val at inbox.ru>
 
 pkgname=libnetworkmanager
-pkgver=0.6.4
-pkgrel=4
+pkgver=0.6.5
+pkgrel=1
 pkgdesc="The Network Manager Library"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=('libgcrypt' 'dbus-glib>=0.71')
-makedepends=('pkgconfig' 'intltool')
-options=(NOLIBTOOL)
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${pkgver}.tar.bz2 
-	configure-no-makedepends.patch
-	libnm_glib-dbus-0.92.patch)
-md5sums=('7d22b8df56d65d7c966cb28e0772d305' '08bcf7840b2da8a1a37f2b4860665776'
-	 '1564e7730b88b74478c20077646b9753')
+depends=('libgcrypt' 'dbus-glib>=0.73')
+makedepends=('pkgconfig' 'perlxml' 'wireless_tools' 'iproute' 'dhcdbd' 'hal' 'libnl' 'wpa_supplicant')
+options=('nolibtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${pkgver}.tar.bz2)
+md5sums=('b827d300eb28458f6588eb843cba418d')
+
 build() {
   cd ${startdir}/src/NetworkManager-${pkgver}
-  patch -Np0 -i ${startdir}/src/libnm_glib-dbus-0.92.patch || return 1
-  patch -Np0 -i ${startdir}/src/configure-no-makedepends.patch || return 1
-  autoconf
-  ./configure --prefix=/usr --sysconfdir=/etc --with-distro=arch --without-gnome
-  for dir in libnm-util utils gnome/libnm_glib; do
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+	      --with-distro=arch --without-gnome
+  for dir in libnm-util utils gnome/libnm_glib include; do
     pushd ${dir}
     make || return 1
     make DESTDIR=${startdir}/pkg install
     popd
   done
 }
-
-
Index: extra/lib/libnetworkmanager/configure-no-makedepends.patch
diff -u extra/lib/libnetworkmanager/configure-no-makedepends.patch:1.1 extra/lib/libnetworkmanager/configure-no-makedepends.patch:removed
--- extra/lib/libnetworkmanager/configure-no-makedepends.patch:1.1	Sun Aug 13 08:01:53 2006
+++ extra/lib/libnetworkmanager/configure-no-makedepends.patch	Thu Apr 26 13:13:18 2007
@@ -1,75 +0,0 @@
---- configure.in.orig	2006-08-13 11:39:37.000000000 +0000
-+++ configure.in	2006-08-13 11:42:04.000000000 +0000
-@@ -81,18 +81,7 @@
- AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
- AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
- 
--AC_MSG_CHECKING([for wireless-tools >= 28pre9])
--AC_TRY_COMPILE([#include <iwlib.h>],
--               [#ifndef IWEVGENIE
--                #error "not found"
--                #endif],
--               [ac_have_iwevgenie=yes],
--               [ac_have_iwevgenie=no])
--AC_MSG_RESULT($ac_have_iwevgenie)
--if test "$ac_have_iwevgenie" = no; then
--	AC_MSG_ERROR(wireless-tools >= 28pre9 not installed or not functional)
--fi
--IWLIB=-liw
-+IWLIB=
- AC_SUBST(IWLIB)
- 
- PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.60)
-@@ -143,7 +132,8 @@
- AC_SUBST(GMODULE_CFLAGS)
- AC_SUBST(GMODULE_LIBS)
- 
--PKG_CHECK_MODULES(HAL, hal >= 0.5.0)
-+HAL_CFLAGS=
-+HAL_LIBS=
- AC_SUBST(HAL_CFLAGS)
- AC_SUBST(HAL_LIBS)
- 
-@@ -177,7 +167,8 @@
- fi
- AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
- 
--PKG_CHECK_MODULES(LIBNL, libnl-1)
-+LIBNL_CFLAGS=
-+LIBNL_LIBS=
- AC_SUBST(LIBNL_CFLAGS)
- AC_SUBST(LIBNL_LIBS)
- 
-@@ -228,30 +219,10 @@
- AC_SUBST(DBUS_SYS_DIR)
- AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is])
- 
--# dhcdbd binary path
--AC_ARG_WITH(dhcdbd, AC_HELP_STRING([--with-dhcdbd=/path/to/dhcdbd], [path to dhcdbd])) 
--if test "x${with_dhcdbd}" = x; then
--  AC_PATH_PROG(DHCDBD_BINARY_PATH, dhcdbd, [], $PATH:/sbin:/usr/sbin)
--  if ! test -x "$DHCDBD_BINARY_PATH"; then
--	AC_MSG_ERROR(dhcdbd was not installed.  See http://people.redhat.com/jvdias/dhcdbd)
--  fi
--else
--  DHCDBD_BINARY_PATH="$with_dhcdbd"
--fi
--AC_DEFINE_UNQUOTED(DHCDBD_BINARY_PATH, "$DHCDBD_BINARY_PATH", [Define to path of dhcdbd binary])
-+DHCDBD_BINARY_PATH=
- AC_SUBST(DHCDBD_BINARY_PATH)
- 
--# wpa_supplicant binary path
--AC_ARG_WITH(wpa_supplicant, AC_HELP_STRING([--with-wpa_supplicant=/path/to/wpa_supplicant], [path to wpa_supplicant]))
--if test "x${with_wpa_supplicant}" = x; then
--  AC_PATH_PROG(WPA_SUPPLICANT_BINARY_PATH, wpa_supplicant, [], $PATH:/sbin:/usr/sbin)
--  if ! test -x "$WPA_SUPPLICANT_BINARY_PATH"; then
--        AC_MSG_ERROR(wpa_supplicant is not installed.  See http://hostap.epitest.fi/wpa_supplicant/)
--  fi
--else
--  WPA_SUPPLICANT_BINARY_PATH="$with_wpa_supplicant"
--fi
--AC_DEFINE_UNQUOTED(WPA_SUPPLICANT_BINARY_PATH, "$WPA_SUPPLICANT_BINARY_PATH", [Define to path of wpa_supplicant binary])
-+WPA_SUPPLICANT_BINARY_PATH=
- AC_SUBST(WPA_SUPPLICANT_BINARY_PATH)
- 
- #### find the actual value for $prefix that we'll end up with
Index: extra/lib/libnetworkmanager/libnm_glib-dbus-0.92.patch
diff -u extra/lib/libnetworkmanager/libnm_glib-dbus-0.92.patch:1.1 extra/lib/libnetworkmanager/libnm_glib-dbus-0.92.patch:removed
--- extra/lib/libnetworkmanager/libnm_glib-dbus-0.92.patch:1.1	Thu Sep 28 12:49:45 2006
+++ extra/lib/libnetworkmanager/libnm_glib-dbus-0.92.patch	Thu Apr 26 13:13:18 2007
@@ -1,25 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/NetworkManager/gnome/libnm_glib/libnm_glib.c,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -r1.12 -r1.13
---- gnome/libnm_glib/libnm_glib.c	2006/05/05 15:34:39	1.12
-+++ gnome/libnm_glib/libnm_glib.c	2006/08/13 20:36:30	1.13
-@@ -230,7 +230,7 @@
- 	{
- 		/* Try to reactivate our connection to dbus on the next pass through the event loop */
- 		ctx->nm_state = LIBNM_NO_DBUS;
--		dbus_connection_disconnect (ctx->dbus_con);
-+		dbus_connection_close (ctx->dbus_con);
- 		libnm_glib_schedule_dbus_watcher (ctx);
- 	}
- 	else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
-@@ -444,7 +444,7 @@
- 		g_main_loop_unref (ctx->g_main_loop);
- 
- 	if (ctx->dbus_con)
--		dbus_connection_disconnect (ctx->dbus_con);
-+		dbus_connection_close (ctx->dbus_con);
- 
- 	if (ctx->callbacks_lock)
- 		g_mutex_free (ctx->callbacks_lock);




More information about the arch-commits mailing list