[arch-commits] CVS update of extra/gnome/gnome-network-manager (PKGBUILD policy.patch)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:49:38
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-network-manager

Modified: PKGBUILD (1.6 -> 1.7) policy.patch (1.1 -> 1.2)

upgpkg: gnome-network-manager 0.6.4-4
Move to /usr, tighten dependencies. Yes, I know it is outdated, will get a laptop next week


--------------+
 PKGBUILD     |   19 ++++++++-----------
 policy.patch |    4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)


Index: extra/gnome/gnome-network-manager/PKGBUILD
diff -u extra/gnome/gnome-network-manager/PKGBUILD:1.6 extra/gnome/gnome-network-manager/PKGBUILD:1.7
--- extra/gnome/gnome-network-manager/PKGBUILD:1.6	Mon Oct 30 15:10:11 2006
+++ extra/gnome/gnome-network-manager/PKGBUILD	Sun Apr 22 13:49:38 2007
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD,v 1.6 2006/10/30 20:10:11 andyrtr Exp $
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.7 2007/04/22 17:49:38 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contrinutor: Arjan Timmerman <arjan 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>
@@ -10,16 +11,16 @@
 pkgdesc="Gnome frontend to NetworkManager"
 arch=(i686 x86_64)
 url="http://www.gnome.org/projects/NetworkManager/"
-makedepends=('pkgconfig' 'intltool')
-depends=('networkmanager>=0.6.4-3' 'gnome-panel' 'libnotify' 'notification-daemon')
+makedepends=('pkgconfig' 'perlxml')
+depends=('networkmanager>=0.6.4-3' 'gnome-panel>=2.18.1' 'libnotify>=0.4.4' 'notification-daemon>=0.3.7-2')
 install=gnome-network-manager.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${pkgver}.tar.bz2
 	policy.patch)
-		
+
 build() {
   cd ${startdir}/src/NetworkManager-${pkgver}
   patch -Np1 -i ${startdir}/src/policy.patch || return 1
-  ./configure --prefix=/opt/gnome --sysconfdir=/etc \
+  ./configure --prefix=/usr --sysconfdir=/etc \
         --with-distro=arch --localstatedir=/var
   make DESTDIR=${startdir}/pkg install-autostartDATA
   pushd utils
@@ -27,12 +28,8 @@
   popd
   pushd gnome
   sed -i -e 's/ libnm_glib / /' Makefile
-  sed -i -e 's|$(top_builddir)/libnm-util/libnm-util.la|/usr/lib/libnm-util.so.0|g' */Makefile
+  sed -i -e 's|$(top_builddir)/libnm-util/libnm-util.la|-lnm-util|g' */Makefile
   make || return 1
   make DESTDIR=${startdir}/pkg install
   popd
-
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/icons
 }
-
Index: extra/gnome/gnome-network-manager/policy.patch
diff -u extra/gnome/gnome-network-manager/policy.patch:1.1 extra/gnome/gnome-network-manager/policy.patch:1.2
--- extra/gnome/gnome-network-manager/policy.patch:1.1	Thu Jun 29 03:28:05 2006
+++ extra/gnome/gnome-network-manager/policy.patch	Sun Apr 22 13:49:38 2007
@@ -6,7 +6,7 @@
                  <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
  	</policy>
 -	<policy at_console="true">
-+	<policy group="users">
++	<policy group="network">
  		<allow own="org.freedesktop.NetworkManagerInfo"/>
  
  		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
@@ -18,7 +18,7 @@
                  <allow send_interface="org.freedesktop.NetworkManager"/>
          </policy>
 -        <policy at_console="true">
-+        <policy group="users">
++        <policy group="network">
                  <allow send_destination="org.freedesktop.NetworkManager"/>
                  <allow send_interface="org.freedesktop.NetworkManager"/>
          </policy>