diff --git a/configure.ac b/configure.ac index 72e47001a..eb366e94e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(NetworkManager, 0.7.998, dcbw@redhat.com, NetworkManager) +AC_INIT(NetworkManager, 0.7.999, dcbw@redhat.com, NetworkManager) AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2]) AM_MAINTAINER_MODE diff --git a/libnm-glib/libnm-glib-vpn.pc.in b/libnm-glib/libnm-glib-vpn.pc.in index 51aec6877..73b7a9c71 100644 --- a/libnm-glib/libnm-glib-vpn.pc.in +++ b/libnm-glib/libnm-glib-vpn.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libnm-glib-vpn Description: Convenience library for NetworkManager VPN plugins Version: @VERSION@ -Requires: NetworkManager >= 0.7.995 glib-2.0 dbus-glib-1 +Requires: NetworkManager >= 0.7.999 glib-2.0 dbus-glib-1 Cflags: -I${includedir}/libnm-glib Libs: -L${libdir} -lnm-glib-vpn diff --git a/libnm-glib/libnm-glib.pc.in b/libnm-glib/libnm-glib.pc.in index d1b85a5d1..5c3471b16 100644 --- a/libnm-glib/libnm-glib.pc.in +++ b/libnm-glib/libnm-glib.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libnm-glib Description: Convenience library for clients of NetworkManager Version: @VERSION@ -Requires: NetworkManager >= 0.7.995 glib-2.0 dbus-glib-1 +Requires: NetworkManager >= 0.7.999 glib-2.0 dbus-glib-1 Cflags: -I${includedir}/libnm-glib Libs: -L${libdir} -lnm-glib diff --git a/libnm-util/libnm-util.pc.in b/libnm-util/libnm-util.pc.in index 7a915ed01..a6e8ee595 100644 --- a/libnm-util/libnm-util.pc.in +++ b/libnm-util/libnm-util.pc.in @@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libnm_util +Name: libnm-util Description: Convenience library for clients of NetworkManager Version: @VERSION@ -Requires: glib-2.0 +Requires: glib-2.0 dbus-glib-1 Cflags: -I${includedir}/NetworkManager Libs: -L${libdir} -lnm-util diff --git a/system-settings/plugins/ifcfg-rh/writer.c b/system-settings/plugins/ifcfg-rh/writer.c index 7f9d806b8..4ded5c681 100644 --- a/system-settings/plugins/ifcfg-rh/writer.c +++ b/system-settings/plugins/ifcfg-rh/writer.c @@ -1206,20 +1206,16 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error) if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) { svSetValue (ifcfg, "IPV6INIT", "no", FALSE); return TRUE; - } - else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_AUTO)) { + } else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_AUTO)) { svSetValue (ifcfg, "IPV6INIT", "yes", FALSE); svSetValue (ifcfg, "IPV6_AUTOCONF", "yes", FALSE); - } - else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) { + } else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) { svSetValue (ifcfg, "IPV6INIT", "yes", FALSE); svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE); - } - else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)) { + } else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)) { svSetValue (ifcfg, "IPV6INIT", "yes", FALSE); svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE); - } - else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_SHARED)) { + } else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_SHARED)) { svSetValue (ifcfg, "IPV6INIT", "yes", FALSE); /* TODO */ }