- Read global gateway from /etc/sysconfig/network if missing (rh #446527)

- nm-system-settings now terminates when dbus goes away (rh #444976)
This commit is contained in:
Daniel Williams 2008-05-19 17:46:12 +00:00
parent e754b73598
commit 87e85fc03a
4 changed files with 13 additions and 18 deletions

View File

@ -102,3 +102,5 @@ NetworkManager-0.7.0.svn3578.tar.gz
nm-applet-0.7.0.svn689.tar.gz
NetworkManager-0.7.0.svn3590.tar.gz
nm-applet-0.7.0.svn694.tar.gz
NetworkManager-0.7.0.svn3675.tar.gz
nm-applet-0.7.0.svn727.tar.gz

View File

@ -68,24 +68,13 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix Net
noinst_LTLIBRARIES = libutils.la
libutils_la_SOURCES = \
@@ -10,7 +14,9 @@ libutils_la_SOURCES = \
libutils_la_CPPFLAGS = $(NMA_CFLAGS)
@@ -11,4 +15,7 @@ libutils_la_CPPFLAGS = \
-I${top_srcdir}/src/gconf-helpers \
-I${top_srcdir}/src
-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-glib $(top_builddir)/../libnm-glib/libnm_glib.la
if WITH_GNUTLS
libutils_la_SOURCES += crypto_gnutls.c
@@ -28,4 +34,7 @@ noinst_PROGRAMS = test-crypto
test_crypto_SOURCES = test-crypto.c
test_crypto_CPPFLAGS = $(NMA_CFLAGS) -D_GNU_SOURCE
-test_crypto_LDADD = $(NMA_LIBS) ${top_builddir}/src/utils/libutils.la
+test_crypto_LDADD = $(NMA_LIBS) ${top_builddir}/src/utils/libutils.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
+
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am

View File

@ -9,8 +9,8 @@ ExcludeArch: s390 s390x
%define libnl_version 1.0-0.15.pre8.git20071218
%define ppp_version 2.2.4
%define snapshot svn3669
%define applet_snapshot svn724
%define snapshot svn3675
%define applet_snapshot svn727
Name: NetworkManager
Summary: Network connection manager and user applications
@ -294,6 +294,10 @@ fi
%changelog
* Mon May 19 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.3.svn3675
- Read global gateway from /etc/sysconfig/network if missing (rh #446527)
- nm-system-settings now terminates when dbus goes away (rh #444976)
* Tue May 14 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.3.svn3669
- Fix initial carrier state detection on devices that are already up (rh #134886)

View File

@ -1,2 +1,2 @@
90afda885df096e7017ddd8aefa52657 nm-applet-0.7.0.svn724.tar.gz
6c5156882d805d024d7e47aac0cb3b9b NetworkManager-0.7.0.svn3669.tar.gz
68f70309e5a8c53e73467318199725cc NetworkManager-0.7.0.svn3675.tar.gz
82d5aa2ed1942fb419f46895f9817ad2 nm-applet-0.7.0.svn727.tar.gz