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

[Jan de Groot]

    Date: Sunday, November 30, 2008 @ 12:22:27
  Author: jgc
Revision: 20141

Merged revisions 20131,20139 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/networkmanager/trunk

........
  r20131 | jgc | 2008-11-30 17:08:38 +0000 (Sun, 30 Nov 2008) | 1 line
  
  upgpkg: networkmanager 0.7.0-1
........
  r20139 | jgc | 2008-11-30 17:20:35 +0000 (Sun, 30 Nov 2008) | 2 lines
  
  Add missing file
........

Added:
  networkmanager/repos/testing-i686/nm-system-settings.conf
    (from rev 20139, networkmanager/trunk/nm-system-settings.conf)
Modified:
  networkmanager/repos/testing-i686/	(properties)
  networkmanager/repos/testing-i686/PKGBUILD

-------------------------+
 PKGBUILD                |   15 +++++++++------
 nm-system-settings.conf |    2 ++
 2 files changed, 11 insertions(+), 6 deletions(-)


Property changes on: networkmanager/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /networkmanager/trunk:1-19108
   + /networkmanager/trunk:1-20140

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-11-30 17:21:06 UTC (rev 20140)
+++ testing-i686/PKGBUILD	2008-11-30 17:22:27 UTC (rev 20141)
@@ -6,21 +6,23 @@
 # Contributor: Valentine Sinitsyn <e_val at inbox.ru>
 
 pkgname=networkmanager
-pkgver=0.7.0rc2
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=('wireless_tools' 'iproute' 'hal>=0.5.11-5' 'libnl>=1.1' 'ppp' 'dhcpcd'
-	 'wpa_supplicant>=0.5.10-2' "libnetworkmanager>=${pkgver}")
+depends=('wireless_tools' 'iproute' 'hal>=0.5.11-7' 'libnl>=1.1' 'ppp' 'dhcpcd>=4.0' 'wpa_supplicant>=0.5.11' "libnetworkmanager>=${pkgver}")
 makedepends=('pkgconfig' 'perlxml')
 options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.7/NetworkManager-0.7.0-rc2.tar.bz2)
-md5sums=('cd9feed3004db64fd4d44f5b4cd5c073')
+backup=('etc/NetworkManager/nm-system-settings.conf')
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.7/NetworkManager-${pkgver}.tar.bz2
+	nm-system-settings.conf)
+md5sums=('64f780e7f95c252eaaed0201c3d9a4ca'
+	 '1653159d6634fb62d3a5c548b7a56151')
 
 build() {
-  cd "${srcdir}/NetworkManager-0.7.0"
+  cd "${srcdir}/NetworkManager-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-distro=arch --localstatedir=/var \
       --libexecdir=/usr/lib/networkmanager \
@@ -32,4 +34,5 @@
   make DESTDIR="${pkgdir}" install || return 1
   install -d -m755 "${pkgdir}/usr/bin"
   install -m755 test/.libs/nm-tool "${pkgdir}/usr/bin/" || return 1
+  install -m644 "${srcdir}/nm-system-settings.conf" "${pkgdir}/etc/NetworkManager/" || return 1
 }

Copied: networkmanager/repos/testing-i686/nm-system-settings.conf (from rev 20139, networkmanager/trunk/nm-system-settings.conf)
===================================================================
--- testing-i686/nm-system-settings.conf	                        (rev 0)
+++ testing-i686/nm-system-settings.conf	2008-11-30 17:22:27 UTC (rev 20141)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile