Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=ded73359b461a3109ecefa4293c9cf01d079f4a9
commit ded73359b461a3109ecefa4293c9cf01d079f4a9 Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Oct 27 00:03:19 2009 +0100 networkmanager-0.7.1.997-2-i686 *rebuild dhcpcd and add patch for detect it diff --git a/source/network-extra/networkmanager/FrugalBuild b/source/network-extra/networkmanager/FrugalBuild index 81f70b5..4247ad4 100644 --- a/source/network-extra/networkmanager/FrugalBuild +++ b/source/network-extra/networkmanager/FrugalBuild @@ -4,9 +4,9 @@ pkgname=networkmanager _F_gnome_name=NetworkManager pkgver=0.7.1.997 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" -depends=('wireless_tools' 'hal' 'iproute2' 'dhcpcd' 'nss' \ +depends=('wireless_tools' 'hal' 'iproute2' 'dhcpcd>=5.1.3' 'nss' \ 'libnl' 'ppp' 'wpa_supplicant' 'iptables' 'policykit') makedepends=('perl-xml-parser' 'intltool') groups=('network-extra') @@ -16,12 +16,13 @@ Finclude gnome backup=('etc/NetworkManager/nm-system-settings.conf') source=($source \ nm-system-settings.conf README.Frugalware \ - dbus-acces.diff rc.networkmanager) + dbus-acces.diff rc.networkmanager detectdhcpcd.diff) sha1sums=('ae72fc0482a1d4175d4c026fff5d58676a11073d' \ '49ba558d20f5ca5a201e027e13b878dd5ac3569c' \ '493e33f57fe82525309a728f7df46c5e4346abca' \ 'de85f4b83115170e6554c469ca421fb31f75acee' \ - '955eed2eb78903fb06b33a1bc85f444c8085757d') + '955eed2eb78903fb06b33a1bc85f444c8085757d' \ + '174b20d2270caf1e4860a699c512cbeb9f6efa6d') _F_cd_path=$_F_gnome_name-$pkgver build() { diff --git a/source/network-extra/networkmanager/detectdhcpcd.diff b/source/network-extra/networkmanager/detectdhcpcd.diff new file mode 100644 index 0000000..3098155 --- /dev/null +++ b/source/network-extra/networkmanager/detectdhcpcd.diff @@ -0,0 +1,12 @@ +--- configure.ac~ 2009-10-16 06:54:58.000000000 +0200 ++++ configure.ac 2009-10-26 23:42:52.000000000 +0100 +@@ -336,7 +336,7 @@ + test -n "$DHCP_CLIENT_PATH" && echo bar + # We fully work with upstream dhcpcd-4 + AC_MSG_CHECKING([for dhcpcd]) +- for client in "$with_dhcp_client" /sbin/dhcpcd /usr/pkg/sbin/dhcpcd /usr/local/sbin/dhcpcd; do ++ for client in "$with_dhcp_client" /usr/sbin/dhcpcd /sbin/dhcpcd /usr/pkg/sbin/dhcpcd /usr/local/sbin/dhcpcd; do + test -x "$client" || continue + case `"$client" --version 2>/dev/null` in + "dhcpcd "[123]*);; + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git