- nm: IPv6 zeroconf support and fixes
- nm: port to polkit (rh #499965) - nm: fixes for ehea devices (rh #511304) (rh #516591) - nm: work around PPP bug causing bogus nameservers for mobile broadband connections - editor: fix segfault with "Unlisted" plans in the mobile broadband assistant
This commit is contained in:
Daniel Williams
parent
82168fbd78
commit
60d6eaef0a
@ -159,3 +159,5 @@ NetworkManager-0.7.995.git20090804.tar.bz2
|
|||||||
network-manager-applet-0.7.995.git20090804.tar.bz2
|
network-manager-applet-0.7.995.git20090804.tar.bz2
|
||||||
NetworkManager-0.7.995.git20090813.tar.bz2
|
NetworkManager-0.7.995.git20090813.tar.bz2
|
||||||
network-manager-applet-0.7.995.git20090813.tar.bz2
|
network-manager-applet-0.7.995.git20090813.tar.bz2
|
||||||
|
NetworkManager-0.7.996.git20090826.tar.bz2
|
||||||
|
network-manager-applet-0.7.996.git20090826.tar.bz2
|
||||||
|
|||||||
@ -1,28 +0,0 @@
|
|||||||
From 4dee9abe1d000d0fc266924949ea7b97e025d7f7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dan Williams <dcbw@redhat.com>
|
|
||||||
Date: Fri, 7 Aug 2009 10:01:50 -0500
|
|
||||||
Subject: [PATCH 1/3] bluetooth: fix device capability checking (need NAP not PANU)
|
|
||||||
|
|
||||||
The remote device (which is what we're checking) needs to provide
|
|
||||||
the NAP service (meaning it can bridge packets to the cellular
|
|
||||||
network), not the PANU service.
|
|
||||||
---
|
|
||||||
src/gnome-bluetooth/network-manager-applet.c | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/gnome-bluetooth/network-manager-applet.c b/src/gnome-bluetooth/network-manager-applet.c
|
|
||||||
index 3cdd5b5..58f5b9c 100644
|
|
||||||
--- a/src/gnome-bluetooth/network-manager-applet.c
|
|
||||||
+++ b/src/gnome-bluetooth/network-manager-applet.c
|
|
||||||
@@ -45,7 +45,7 @@ has_config_widget (const char *bdaddr, const char **uuids)
|
|
||||||
|
|
||||||
for (i = 0; uuids && uuids[i] != NULL; i++) {
|
|
||||||
g_message ("has_config_widget %s %s", bdaddr, uuids[i]);
|
|
||||||
- if (g_str_equal (uuids[i], "PANU"))
|
|
||||||
+ if (g_str_equal (uuids[i], "NAP"))
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
return FALSE;
|
|
||||||
--
|
|
||||||
1.6.2.5
|
|
||||||
|
|
||||||
@ -1,21 +1,21 @@
|
|||||||
%define udev_scriptdir /lib/udev
|
%define udev_scriptdir /lib/udev
|
||||||
|
|
||||||
%define dbus_version 1.1
|
%define dbus_version 1.1
|
||||||
%define dbus_glib_version 0.73-6
|
%define dbus_glib_version 0.75
|
||||||
|
|
||||||
%define gtk2_version 2.12.0
|
%define gtk2_version 2.12.0
|
||||||
%define wireless_tools_version 1:28-0pre9
|
%define wireless_tools_version 1:28-0pre9
|
||||||
%define libnl_version 1.1
|
%define libnl_version 1.1
|
||||||
%define ppp_version 2.2.4
|
%define ppp_version 2.2.4
|
||||||
|
|
||||||
%define snapshot .git20090813
|
%define snapshot .git20090826
|
||||||
%define applet_snapshot .git20090813
|
%define applet_snapshot .git20090826
|
||||||
|
|
||||||
Name: NetworkManager
|
Name: NetworkManager
|
||||||
Summary: Network connection manager and user applications
|
Summary: Network connection manager and user applications
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 0.7.995
|
Version: 0.7.996
|
||||||
Release: 3%{snapshot}%{?dist}
|
Release: 1%{snapshot}%{?dist}
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.gnome.org/projects/NetworkManager/
|
URL: http://www.gnome.org/projects/NetworkManager/
|
||||||
@ -40,7 +40,7 @@ Requires: avahi-autoipd
|
|||||||
Requires: dnsmasq
|
Requires: dnsmasq
|
||||||
Requires: udev
|
Requires: udev
|
||||||
Requires: mobile-broadband-provider-info >= 0.20090602
|
Requires: mobile-broadband-provider-info >= 0.20090602
|
||||||
Requires: ModemManager >= 0.2
|
Requires: ModemManager >= 0.2-3.20090826
|
||||||
Obsoletes: dhcdbd
|
Obsoletes: dhcdbd
|
||||||
|
|
||||||
Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
|
Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
|
||||||
@ -64,7 +64,7 @@ BuildRequires: perl(XML::Parser)
|
|||||||
BuildRequires: automake autoconf intltool libtool
|
BuildRequires: automake autoconf intltool libtool
|
||||||
BuildRequires: ppp-devel >= %{ppp_version}
|
BuildRequires: ppp-devel >= %{ppp_version}
|
||||||
BuildRequires: nss-devel >= 3.11.7
|
BuildRequires: nss-devel >= 3.11.7
|
||||||
BuildRequires: PolicyKit-devel PolicyKit-gnome-devel
|
BuildRequires: polkit-devel
|
||||||
BuildRequires: dhclient
|
BuildRequires: dhclient
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
BuildRequires: libudev-devel
|
BuildRequires: libudev-devel
|
||||||
@ -274,7 +274,7 @@ fi
|
|||||||
%dir %{_sysconfdir}/NetworkManager/system-connections
|
%dir %{_sysconfdir}/NetworkManager/system-connections
|
||||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
||||||
%{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
|
%{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
|
||||||
%{_datadir}/PolicyKit/policy/*.policy
|
%{_datadir}/polkit-1/actions/*.policy
|
||||||
%{udev_scriptdir}/rules.d/*.rules
|
%{udev_scriptdir}/rules.d/*.rules
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
@ -300,11 +300,12 @@ fi
|
|||||||
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
||||||
%dir %{_datadir}/gnome-vpn-properties
|
%dir %{_datadir}/gnome-vpn-properties
|
||||||
%{_libdir}/gnome-bluetooth/plugins/*
|
%{_libdir}/gnome-bluetooth/plugins/*
|
||||||
|
%{_sysconfdir}/gconf/schemas/nm-applet.schemas
|
||||||
|
|
||||||
%files glib
|
%files glib
|
||||||
%defattr(-,root,root,0755)
|
%defattr(-,root,root,0755)
|
||||||
%{_libdir}/libnm_glib.so.*
|
%{_libdir}/libnm-glib.so.*
|
||||||
%{_libdir}/libnm_glib_vpn.so.*
|
%{_libdir}/libnm-glib-vpn.so.*
|
||||||
%{_libdir}/libnm-util.so.*
|
%{_libdir}/libnm-util.so.*
|
||||||
|
|
||||||
%files glib-devel
|
%files glib-devel
|
||||||
@ -312,11 +313,11 @@ fi
|
|||||||
%dir %{_includedir}/libnm-glib
|
%dir %{_includedir}/libnm-glib
|
||||||
%{_includedir}/libnm-glib/*.h
|
%{_includedir}/libnm-glib/*.h
|
||||||
%{_includedir}/%{name}/nm-*.h
|
%{_includedir}/%{name}/nm-*.h
|
||||||
%{_libdir}/pkgconfig/libnm_glib.pc
|
%{_libdir}/pkgconfig/libnm-glib.pc
|
||||||
%{_libdir}/pkgconfig/libnm_glib_vpn.pc
|
%{_libdir}/pkgconfig/libnm-glib-vpn.pc
|
||||||
%{_libdir}/pkgconfig/libnm-util.pc
|
%{_libdir}/pkgconfig/libnm-util.pc
|
||||||
%{_libdir}/libnm_glib.so
|
%{_libdir}/libnm-glib.so
|
||||||
%{_libdir}/libnm_glib_vpn.so
|
%{_libdir}/libnm-glib-vpn.so
|
||||||
%{_libdir}/libnm-util.so
|
%{_libdir}/libnm-util.so
|
||||||
%dir %{_datadir}/gtk-doc/html/libnm-glib
|
%dir %{_datadir}/gtk-doc/html/libnm-glib
|
||||||
%{_datadir}/gtk-doc/html/libnm-glib/*
|
%{_datadir}/gtk-doc/html/libnm-glib/*
|
||||||
@ -324,6 +325,13 @@ fi
|
|||||||
%{_datadir}/gtk-doc/html/libnm-util/*
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 26 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-1.git20090826
|
||||||
|
- nm: IPv6 zeroconf support and fixes
|
||||||
|
- nm: port to polkit (rh #499965)
|
||||||
|
- nm: fixes for ehea devices (rh #511304) (rh #516591)
|
||||||
|
- nm: work around PPP bug causing bogus nameservers for mobile broadband connections
|
||||||
|
- editor: fix segfault with "Unlisted" plans in the mobile broadband assistant
|
||||||
|
|
||||||
* Thu Aug 13 2009 Dan Williams <dcbw@redhat.com> - 0.7.995-3.git20090813
|
* Thu Aug 13 2009 Dan Williams <dcbw@redhat.com> - 0.7.995-3.git20090813
|
||||||
- nm: add iSCSI support
|
- nm: add iSCSI support
|
||||||
- nm: add connection assume/takeover support for ethernet (rh #517333)
|
- nm: add connection assume/takeover support for ethernet (rh #517333)
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac
|
diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac
|
||||||
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
|
--- NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
|
||||||
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac 2009-07-28 13:11:39.261718877 -0400
|
+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac 2009-07-28 13:11:39.261718877 -0400
|
||||||
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
|
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
|
||||||
PKG_CHECK_MODULES(NMA,
|
PKG_CHECK_MODULES(NMA,
|
||||||
[dbus-glib-1 >= 0.74
|
[dbus-glib-1 >= 0.74
|
||||||
glib-2.0 >= 2.10
|
glib-2.0 >= 2.16
|
||||||
- NetworkManager >= 0.7.1
|
- NetworkManager >= 0.7.996
|
||||||
- libnm_glib >= 0.7.1
|
- libnm-glib >= 0.7.996
|
||||||
- libnm-util >= 0.7.1
|
- libnm-util >= 0.7.996
|
||||||
- libnm_glib_vpn >= 0.7.1
|
- libnm-glib-vpn >= 0.7.996
|
||||||
gtk+-2.0 >= 2.14
|
gtk+-2.0 >= 2.14
|
||||||
libglade-2.0
|
libglade-2.0
|
||||||
gmodule-export-2.0
|
gmodule-export-2.0
|
||||||
@ -18,14 +18,14 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buil
|
|||||||
gconf-2.0
|
gconf-2.0
|
||||||
- gnome-bluetooth-1.0 >= 2.27.6
|
- gnome-bluetooth-1.0 >= 2.27.6
|
||||||
- libnm-util
|
- libnm-util
|
||||||
- libnm_glib,
|
- libnm-glib,
|
||||||
+ gnome-bluetooth-1.0 >= 2.27.6,
|
+ gnome-bluetooth-1.0 >= 2.27.6,
|
||||||
have_gbt=yes, have_gbt=no)
|
have_gbt=yes, have_gbt=no)
|
||||||
AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
|
AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
|
||||||
|
|
||||||
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am
|
diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am
|
||||||
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
|
--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
|
||||||
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
|
+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
|
||||||
@@ -1,5 +1,9 @@
|
@@ -1,5 +1,9 @@
|
||||||
bin_PROGRAMS = nm-connection-editor
|
bin_PROGRAMS = nm-connection-editor
|
||||||
|
|
||||||
@ -36,21 +36,21 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-ed
|
|||||||
nm_connection_editor_CPPFLAGS = \
|
nm_connection_editor_CPPFLAGS = \
|
||||||
$(NMA_CFLAGS) \
|
$(NMA_CFLAGS) \
|
||||||
-DICONDIR=\""$(datadir)/icons"\" \
|
-DICONDIR=\""$(datadir)/icons"\" \
|
||||||
@@ -66,7 +70,10 @@ nm_connection_editor_LDADD = \
|
@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
|
||||||
|
${top_builddir}/src/wireless-security/libwireless-security.la \
|
||||||
${top_builddir}/src/utils/libutils.la \
|
${top_builddir}/src/utils/libutils.la \
|
||||||
${top_builddir}/src/marshallers/libmarshallers.la \
|
${top_builddir}/src/marshallers/libmarshallers.la \
|
||||||
$(NMA_LIBS) \
|
- $(NMA_LIBS)
|
||||||
- $(POLKIT_LIBS)
|
+ $(NMA_LIBS) \
|
||||||
+ $(POLKIT_LIBS) \
|
|
||||||
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||||
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
|
||||||
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
|
||||||
|
|
||||||
if NO_POLKIT_GNOME
|
gladedir = $(datadir)/nm-applet
|
||||||
nm_connection_editor_LDADD += \
|
glade_DATA = \
|
||||||
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am
|
diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am
|
||||||
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
|
--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
|
||||||
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||||
@@ -1,3 +1,7 @@
|
@@ -1,3 +1,7 @@
|
||||||
+INCLUDES = -I${top_srcdir}/../include \
|
+INCLUDES = -I${top_srcdir}/../include \
|
||||||
+ -I${top_srcdir}/../libnm-util \
|
+ -I${top_srcdir}/../libnm-util \
|
||||||
@ -66,11 +66,11 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers
|
|||||||
- ${top_builddir}/src/utils/libutils.la
|
- ${top_builddir}/src/utils/libutils.la
|
||||||
+ ${top_builddir}/src/utils/libutils.la \
|
+ ${top_builddir}/src/utils/libutils.la \
|
||||||
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||||
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
||||||
|
|
||||||
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am
|
diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am
|
||||||
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
|
--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
|
||||||
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
|
+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
|
||||||
@@ -6,6 +6,9 @@ INCLUDES = \
|
@@ -6,6 +6,9 @@ INCLUDES = \
|
||||||
-DLOCALEDIR="\"$(datadir)/locale\"" \
|
-DLOCALEDIR="\"$(datadir)/locale\"" \
|
||||||
-I$(top_srcdir)/src/gconf-helpers/ \
|
-I$(top_srcdir)/src/gconf-helpers/ \
|
||||||
@ -90,13 +90,13 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetoo
|
|||||||
+ $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
|
+ $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
|
||||||
+ $(GNOME_BLUETOOTH_LIBS) \
|
+ $(GNOME_BLUETOOTH_LIBS) \
|
||||||
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||||
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST = network-manager-applet.c
|
EXTRA_DIST = network-manager-applet.c
|
||||||
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am
|
diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am
|
||||||
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
|
--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
|
||||||
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||||
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
|
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
|
||||||
|
|
||||||
bin_PROGRAMS = nm-applet
|
bin_PROGRAMS = nm-applet
|
||||||
@ -115,13 +115,13 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.b
|
|||||||
- ${top_builddir}/src/wireless-security/libwireless-security.la
|
- ${top_builddir}/src/wireless-security/libwireless-security.la
|
||||||
+ ${top_builddir}/src/wireless-security/libwireless-security.la \
|
+ ${top_builddir}/src/wireless-security/libwireless-security.la \
|
||||||
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||||
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
||||||
|
|
||||||
gladedir = $(datadir)/nm-applet
|
gladedir = $(datadir)/nm-applet
|
||||||
glade_DATA = applet.glade keyring.png
|
glade_DATA = applet.glade keyring.png
|
||||||
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am
|
diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am
|
||||||
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
||||||
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||||
@@ -1,3 +1,7 @@
|
@@ -1,3 +1,7 @@
|
||||||
+INCLUDES = -I${top_srcdir}/../include \
|
+INCLUDES = -I${top_srcdir}/../include \
|
||||||
+ -I${top_srcdir}/../libnm-util \
|
+ -I${top_srcdir}/../libnm-util \
|
||||||
@ -137,11 +137,11 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefil
|
|||||||
-libutils_la_LIBADD = $(NMA_LIBS)
|
-libutils_la_LIBADD = $(NMA_LIBS)
|
||||||
+libutils_la_LIBADD = $(NMA_LIBS) \
|
+libutils_la_LIBADD = $(NMA_LIBS) \
|
||||||
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||||
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
||||||
+
|
+
|
||||||
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am
|
diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am
|
||||||
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
||||||
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
|
+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
|
||||||
@@ -1,5 +1,9 @@
|
@@ -1,5 +1,9 @@
|
||||||
noinst_LTLIBRARIES = libwireless-security.la
|
noinst_LTLIBRARIES = libwireless-security.la
|
||||||
|
|
||||||
@ -159,5 +159,5 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-secu
|
|||||||
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
|
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
|
||||||
+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
||||||
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||||
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
||||||
|
|
||||||
|
|||||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
49aeb927168b4f486509492ba5e49825 NetworkManager-0.7.995.git20090813.tar.bz2
|
8c127ddbad7510625b93c75d91e49eee NetworkManager-0.7.996.git20090826.tar.bz2
|
||||||
57680ec416238cdce5be61d59cf82283 network-manager-applet-0.7.995.git20090813.tar.bz2
|
962265d2401eeb21c645760d2ccac890 network-manager-applet-0.7.996.git20090826.tar.bz2
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user