From ac78a214199d0264edca934cf4e36318cac57f47 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Feb 19 2010 20:51:28 +0000 Subject: - core: update to final 0.8 release - core: fix Bluetooth DUN connections when secrets are needed - ifcfg-rh: add helper for initscripts to determine ifcfg connection UUIDs - applet: fix Bluetooth connection secrets requests - applet: fix rare conflict with other gnome-bluetooth plugins --- diff --git a/NetworkManager.spec b/NetworkManager.spec index 6309a88..22de773 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,16 +9,16 @@ %define libnl_version 1.1 %define ppp_version 2.4.5 -%define snapshot .git20100211 -%define applet_snapshot .git20100211 -%define nmcli_snapshot -git20100211 -%define realversion 0.7.999 +%define snapshot .git20100219 +%define applet_snapshot .git20100219 +%define nmcli_snapshot -git20100219 +%define realversion 0.8 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.8.0 -Release: 0.4%{snapshot}%{?dist} +Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -312,6 +312,7 @@ fi %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf +%{_sysconfdir}/dbus-1/system.d/nm-ifcfg-rh.conf %config %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} %{_bindir}/nmcli @@ -389,6 +390,13 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Fri Feb 19 2010 Dan Williams - 0.8-1.git20100219 +- core: update to final 0.8 release +- core: fix Bluetooth DUN connections when secrets are needed +- ifcfg-rh: add helper for initscripts to determine ifcfg connection UUIDs +- applet: fix Bluetooth connection secrets requests +- applet: fix rare conflict with other gnome-bluetooth plugins + * Thu Feb 11 2010 Dan Williams - 0.8-0.4.git20100211 - core: fix mobile broadband PIN handling (rh #543088) (rh #560742) - core: better handling of /etc/hosts if hostname was already added by the user diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 83e8d0a..0c5cf62 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,14 +1,14 @@ -diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac 2009-07-28 13:11:39.261718877 -0400 +diff -up NetworkManager-0.8/network-manager-applet-0.8/configure.ac.buildfix NetworkManager-0.8/network-manager-applet-0.8/configure.ac +--- NetworkManager-0.8/network-manager-applet-0.8/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 ++++ NetworkManager-0.8/network-manager-applet-0.8/configure.ac 2009-07-28 13:11:39.261718877 -0400 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.74 glib-2.0 >= 2.16 -- NetworkManager >= 0.7.999 -- libnm-glib >= 0.7.999 -- libnm-util >= 0.7.999 -- libnm-glib-vpn >= 0.7.999 +- NetworkManager >= 0.8 +- libnm-glib >= 0.8 +- libnm-util >= 0.8 +- libnm-glib-vpn >= 0.8 gtk+-2.0 >= 2.14 libglade-2.0 gmodule-export-2.0 @@ -17,15 +17,15 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac.buil PKG_CHECK_MODULES(GNOME_BLUETOOTH, gconf-2.0 - gnome-bluetooth-1.0 >= 2.27.6 -- libnm-util -- libnm-glib, +- libnm-util >= 0.8 +- libnm-glib >= 0.8, + gnome-bluetooth-1.0 >= 2.27.6, have_gbt=yes, have_gbt=no) AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes") -diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +diff -up NetworkManager-0.8/network-manager-applet-0.8/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/connection-editor/Makefile.am +--- NetworkManager-0.8/network-manager-applet-0.8/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 ++++ NetworkManager-0.8/network-manager-applet-0.8/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 @@ -1,5 +1,9 @@ bin_PROGRAMS = nm-connection-editor @@ -48,9 +48,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-ed gladedir = $(datadir)/nm-applet glade_DATA = \ -diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.8/network-manager-applet-0.8/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/gconf-helpers/Makefile.am +--- NetworkManager-0.8/network-manager-applet-0.8/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 ++++ NetworkManager-0.8/network-manager-applet-0.8/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -68,9 +68,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers + -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.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +diff -up NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makefile.am +--- NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 ++++ NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 @@ -6,6 +6,9 @@ INCLUDES = \ -I$(top_builddir) \ -I${top_builddir}/src/marshallers \ @@ -92,9 +92,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetoo endif EXTRA_DIST = \ -diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am +--- NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 ++++ NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper bin_PROGRAMS = nm-applet @@ -117,9 +117,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am.b gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.8/network-manager-applet-0.8/src/utils/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/utils/Makefile.am +--- NetworkManager-0.8/network-manager-applet-0.8/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.8/network-manager-applet-0.8/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,5 +1,9 @@ SUBDIRS=. tests @@ -139,9 +139,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefil + -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.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.8/network-manager-applet-0.8/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/utils/tests/Makefile.am +--- NetworkManager-0.8/network-manager-applet-0.8/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.8/network-manager-applet-0.8/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,4 +1,7 @@ -INCLUDES = -I$(top_srcdir)/src/utils +INCLUDES = -I$(top_srcdir)/src/utils \ @@ -151,9 +151,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/M noinst_PROGRAMS = test-utils -diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +diff -up NetworkManager-0.8/network-manager-applet-0.8/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/wireless-security/Makefile.am +--- NetworkManager-0.8/network-manager-applet-0.8/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.8/network-manager-applet-0.8/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch index c791279..a063a7b 100644 --- a/nm-applet-no-notifications.patch +++ b/nm-applet-no-notifications.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in.foo NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in ---- NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 -+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +diff -up NetworkManager-0.8/network-manager-applet-0.8/nm-applet.schemas.in.foo NetworkManager-0.8/network-manager-applet-0.8/nm-applet.schemas.in +--- NetworkManager-0.8/network-manager-applet-0.8/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 ++++ NetworkManager-0.8/network-manager-applet-0.8/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 @@ -6,7 +6,7 @@ /apps/nm-applet/disable-connected-notifications nm-applet diff --git a/nmcli-build.patch b/nmcli-build.patch index af884bf..1f8d57a 100644 --- a/nmcli-build.patch +++ b/nmcli-build.patch @@ -22,9 +22,12 @@ diff -up NetworkManager-0.7.999/nmcli/src/CMakeLists.txt.foo NetworkManager-0.7. #ADD_DEFINITIONS( -Wall -Werror -std=gnu89 -g -O2 -Wshadow ADD_DEFINITIONS( -Wall -std=gnu89 -g -O0 -Wshadow -@@ -28,4 +29,4 @@ set (NMCLI_SRC +@@ -44,7 +45,7 @@ + INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}) ADD_EXECUTABLE (nmcli ${NMCLI_SRC}) - -TARGET_LINK_LIBRARIES (nmcli ${LIBNM_LIBRARIES}) +TARGET_LINK_LIBRARIES (nmcli -L../../libnm-util/.libs/ -L../../libnm-glib/.libs/ -lnm-glib -lnm-util -lnm-glib-vpn ${DBUS_GLIB_LIBRARIES}) + + INSTALL(TARGETS nmcli DESTINATION bin) + diff --git a/sources b/sources index 7a50191..9d51b52 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b80c04c5e10b0d1dae5b76efa39ca65b NetworkManager-0.7.999.git20100211.tar.bz2 -76577af2ffd1a70b5ddd7879a845ca6b network-manager-applet-0.7.999.git20100211.tar.bz2 -6e0d95a40d197a4c5afa920ea6ad4ea7 nmcli-git20100211.tar.bz2 +c904a8a63e0417898cf3a311ec1ed2f6 NetworkManager-0.8.git20100219.tar.bz2 +af60e13c6481ee0dcfc991e56247bb6c network-manager-applet-0.8.git20100219.tar.bz2 +645f7ed29e1bcb52d59c2db12110cc3c nmcli-git20100219.tar.bz2