commit NetworkManager-applet for openSUSE:Factory
Hello community, here is the log from the commit of package NetworkManager-applet for openSUSE:Factory checked in at 2017-02-02 15:28:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-applet (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-applet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-applet" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-applet/NetworkManager-applet.changes 2016-11-10 13:09:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager-applet.new/NetworkManager-applet.changes 2017-02-03 17:30:53.554520751 +0100 @@ -1,0 +2,38 @@ +Wed Feb 1 20:58:55 UTC 2017 - zaitor@opensuse.org + +- Add libnma-data Requires to the main package. +- Move %glib2_gsettings_schema_requires and post(un) handling to + libnma-data where these now live. + +------------------------------------------------------------------- +Wed Jan 25 22:01:41 UTC 2017 - zaitor@opensuse.org + +- Update to version 1.4.4: + + Added the capability to start inport of a VPN connection from + the command line with "nm-connection-editor --import" option. + + Allow editing of Ethernet link properties, such as link speed + or duplex setting. + + Added support for creating and editing IP tunnel connections. + + Added support for editing Proxy setting whe built with + NetworkManager 1.6 or newer. + + Added support for TTLS/MSCHAPV2 method. + + Improved the cloned MAC address selection. + + Lot of bug fixes. + + Updated translations. +- Rebase network-manager-applet-no-firewalld.patch. +- Drop libnm-gtk-data sub package, no longer built. Following this + add libnm-gtk-data Obsoletes to libnm-gtk package, and remove + Requires. + +------------------------------------------------------------------- +Thu Jan 19 10:43:17 UTC 2017 - zaitor@opensuse.org + +- Move schema files to common sub package libnma-data. + +------------------------------------------------------------------- +Thu Dec 1 15:29:32 UTC 2016 - dimstar@opensuse.org + +- Disable appindicator support on SLE: the required dependencies + are not available. + +------------------------------------------------------------------- Old: ---- network-manager-applet-1.4.2.tar.xz New: ---- network-manager-applet-1.4.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-applet.spec ++++++ --- /var/tmp/diff_new_pack.TStJ3G/_old 2017-02-03 17:30:54.278418294 +0100 +++ /var/tmp/diff_new_pack.TStJ3G/_new 2017-02-03 17:30:54.278418294 +0100 @@ -1,7 +1,7 @@ # # spec file for package NetworkManager-applet # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,17 @@ # +%if 0%{?is_opensuse} +%bcond_without appindicator +%else +%bcond_with appindicator +%endif + %define with_cacert_patch 0 %define sover 0 %define _name network-manager-applet Name: NetworkManager-applet -Version: 1.4.2 +Version: 1.4.4 Release: 0 Summary: GTK+ tray applet for use with NetworkManager License: GPL-2.0+ @@ -31,7 +37,7 @@ Patch0: nm-applet-private-connection.patch # PATCH-NEEDS-REBASE nm-applet-probe-radius-server-cert.patch bsc#574266 glin@suse.com -- Probe the RADIUS server certificate. (WAS: PATCH-FIX-UPSTREAM) Patch1: nm-applet-probe-radius-server-cert.patch -# PATCH-FEATURE-UPSTREAM network-manager-applet-no-firewalld.patch boo#897636 bgo#737687 dimstar@opensuse.org -- Allow disabling FirewallD integration. +# PATCH-FEATURE-UPSTREAM network-manager-applet-no-firewalld.patch boo#897636 bgo#737687 dimstar@opensuse.org -- Allow disabling FirewallD integration Patch2: network-manager-applet-no-firewalld.patch # Needed for patch0 - disabled since patch0 is disabled. #BuildRequires: gnome-common @@ -43,10 +49,12 @@ BuildRequires: polkit-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(NetworkManager) >= 1.3 +%if %{with appindicator} BuildRequires: pkgconfig(appindicator3-0.1) +%endif BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) >= 16.04.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.4 BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.4 BuildRequires: pkgconfig(gudev-1.0) >= 147 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(jansson) >= 2.3 @@ -58,6 +66,7 @@ BuildRequires: pkgconfig(libsecret-unstable) BuildRequires: pkgconfig(mm-glib) Requires: NetworkManager >= 0.9.3 +Requires: libnma-data Requires: dbus(org.freedesktop.secrets) # Needed for translated country names. Requires: iso-codes @@ -71,7 +80,6 @@ Provides: NetworkManager-gnome = %{version} Obsoletes: NetworkManager-gnome < %{version} Obsoletes: NetworkManager-gnome-lang -%glib2_gsettings_schema_requires %if !0%{?is_opensuse} BuildRequires: translation-update-upstream %endif @@ -94,7 +102,6 @@ %package -n libnma%{sover} Summary: NetworkManager UI dialog library Group: System/Libraries -# The .ui files are split in case libnma ever bumps ABI. Requires: libnma-data >= %{version} %description -n libnma%{sover} @@ -104,6 +111,7 @@ Summary: NetworkManager UI dialogs Group: System/Libraries BuildArch: noarch +%glib2_gsettings_schema_requires %description -n libnma-data This package provides GTK+ dialogs for NetworkManager integration. @@ -128,22 +136,11 @@ %package -n libnm-gtk%{sover} Summary: NetworkManager Gtk+ dialog library Group: System/Libraries -# The .ui files are split in case libnm-gtk ever bumps ABI. -Requires: libnm-gtk-data >= %{version} +Obsoletes: libnm-gtk-data < %{version} %description -n libnm-gtk%{sover} This library provides GTK+ dialogs for NetworkManager integration. -%package -n libnm-gtk-data -Summary: NetworkManager Gtk+ dialogs -Group: System/Libraries -# Until the appearance of the NetworkManager 1.1 branch, the .ui -# files were shipped in libnm-gtk0 directly, violating the SLPP. -Conflicts: libnm-gtk0 < 1.1 - -%description -n libnm-gtk-data -This package provides GTK+ dialogs for NetworkManager integration. - %package -n typelib-1_0-NMGtk-1_0 Summary: NetworkManager Gtk+ dialogs -- Introspection bindings Group: System/Libraries @@ -181,7 +178,11 @@ %configure \ --disable-static \ --disable-maintainer-mode \ +%if %{with appindicator} --with-appindicator +%else + --without-appindicator +%endif make %{?_smp_mflags} %install @@ -193,11 +194,15 @@ %post %desktop_database_post %icon_theme_cache_post + +%post -n libnma-data %glib2_gsettings_schema_post %postun %desktop_database_postun %icon_theme_cache_postun + +%postun -n libnma-data %glib2_gsettings_schema_postun %post -n libnm-gtk%{sover} -p /sbin/ldconfig @@ -213,11 +218,6 @@ %doc COPYING CONTRIBUTING NEWS %{_sysconfdir}/xdg/autostart/nm-applet.desktop %{_bindir}/nm-applet -%{_datadir}/nm-applet/ -# This file moves to NetworkManager-connection-editor -%exclude %{_datadir}/nm-applet/nm-connection-editor.ui -%{_datadir}/GConf/gsettings/nm-applet.convert -%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml %{_datadir}/applications/nm-applet.desktop %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.svg @@ -229,8 +229,6 @@ %files -n NetworkManager-connection-editor %defattr(-,root,root) %{_bindir}/nm-connection-editor -%dir %{_datadir}/nm-applet/ -%{_datadir}/nm-applet/nm-connection-editor.ui %{_datadir}/applications/nm-connection-editor.desktop %dir %{_datadir}/appdata/ %{_datadir}/appdata/nm-connection-editor.appdata.xml @@ -240,10 +238,6 @@ %defattr(-,root,root) %{_libdir}/libnm-gtk.so.%{sover}* -%files -n libnm-gtk-data -%defattr(-,root,root) -%{_datadir}/libnm-gtk/ - %files -n typelib-1_0-NMGtk-1_0 %defattr(-,root,root) %{_libdir}/girepository-1.0/NMGtk-1.0.typelib @@ -265,7 +259,8 @@ %files -n libnma-data %defattr(-,root,root) -%{_datadir}/libnma/ +%{_datadir}/GConf/gsettings/nm-applet.convert +%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml %files -n libnma-devel %defattr(-,root,root) ++++++ network-manager-applet-1.4.2.tar.xz -> network-manager-applet-1.4.4.tar.xz ++++++ ++++ 121148 lines of diff (skipped) ++++++ network-manager-applet-no-firewalld.patch ++++++ --- /var/tmp/diff_new_pack.TStJ3G/_old 2017-02-03 17:30:55.022313008 +0100 +++ /var/tmp/diff_new_pack.TStJ3G/_new 2017-02-03 17:30:55.026312442 +0100 @@ -17,11 +17,11 @@ src/connection-editor/page-general.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) -Index: network-manager-applet-1.4.0/configure.ac +Index: network-manager-applet-1.4.4/configure.ac =================================================================== ---- network-manager-applet-1.4.0.orig/configure.ac -+++ network-manager-applet-1.4.0/configure.ac -@@ -110,6 +110,11 @@ fi +--- network-manager-applet-1.4.4.orig/configure.ac ++++ network-manager-applet-1.4.4/configure.ac +@@ -108,6 +108,11 @@ fi AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes") @@ -33,11 +33,11 @@ dnl ModemManager1 with libmm-glib for WWAN support AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)])) if (test "${with_wwan}" == "no"); then -Index: network-manager-applet-1.4.0/src/connection-editor/page-general.c +Index: network-manager-applet-1.4.4/src/connection-editor/page-general.c =================================================================== ---- network-manager-applet-1.4.0.orig/src/connection-editor/page-general.c -+++ network-manager-applet-1.4.0/src/connection-editor/page-general.c -@@ -58,6 +58,7 @@ enum { +--- network-manager-applet-1.4.4.orig/src/connection-editor/page-general.c ++++ network-manager-applet-1.4.4/src/connection-editor/page-general.c +@@ -60,6 +60,7 @@ enum { N_COLUMNS }; @@ -45,7 +45,7 @@ static void populate_firewall_zones_ui (CEPageGeneral *self); static void -@@ -125,16 +126,19 @@ on_fw_proxy_acquired (GObject *object, G +@@ -127,16 +128,18 @@ on_fw_proxy_acquired (GObject *object, G (GAsyncReadyCallback) get_zones_cb, self); } @@ -56,25 +56,25 @@ { CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self); GtkBuilder *builder; -+ builder = CE_PAGE (self)->builder; -+ -+#if 0 - GtkWidget *vbox; - GtkLabel *label; - -- builder = CE_PAGE (self)->builder; +- GtkWidget *vbox; +- + builder = CE_PAGE (self)->builder; ++#if 0 ++ GtkWidget *vbox; ++ /*-- Firewall zone --*/ priv->firewall_zone = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new ()); -@@ -158,6 +162,7 @@ general_private_init (CEPageGeneral *sel + +@@ -158,6 +161,7 @@ general_private_init (CEPageGeneral *sel /* Set mnemonic widget for device Firewall zone label */ - label = GTK_LABEL (gtk_builder_get_object (builder, "firewall_zone_label")); - gtk_label_set_mnemonic_widget (label, GTK_WIDGET (priv->firewall_zone)); + priv->firewall_zone_label = GTK_LABEL (gtk_builder_get_object (builder, "firewall_zone_label")); + gtk_label_set_mnemonic_widget (priv->firewall_zone_label, GTK_WIDGET (priv->firewall_zone)); +#endif /*-- Dependent VPN connection --*/ priv->dependent_vpn_checkbox = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "dependent_vpn_checkbox")); -@@ -178,9 +183,9 @@ dispose (GObject *object) +@@ -180,9 +184,9 @@ dispose (GObject *object) g_clear_object (&priv->cancellable); } g_clear_object (&priv->fw_proxy); @@ -86,7 +86,7 @@ G_OBJECT_CLASS (ce_page_general_parent_class)->dispose (object); } -@@ -199,6 +204,7 @@ vpn_checkbox_toggled (GtkToggleButton *b +@@ -211,6 +215,7 @@ autoconnect_checkbox_toggled (GtkToggleB ce_page_changed (CE_PAGE (user_data)); } @@ -94,7 +94,7 @@ static void populate_firewall_zones_ui (CEPageGeneral *self) { -@@ -237,6 +243,7 @@ populate_firewall_zones_ui (CEPageGenera +@@ -248,6 +253,7 @@ populate_firewall_zones_ui (CEPageGenera stuff_changed (NULL, self); } @@ -102,7 +102,7 @@ static void populate_ui (CEPageGeneral *self) -@@ -250,9 +257,11 @@ populate_ui (CEPageGeneral *self) +@@ -261,9 +267,11 @@ populate_ui (CEPageGeneral *self) GtkTreeIter iter; gboolean global_connection = TRUE; @@ -114,7 +114,7 @@ /* Secondary UUID (VPN) */ vpn_uuid = nm_setting_connection_get_secondary (setting, 0); -@@ -314,7 +323,9 @@ finish_setup (CEPageGeneral *self, gpoin +@@ -332,7 +340,9 @@ finish_setup (CEPageGeneral *self, gpoin populate_ui (self);
participants (1)
-
root@hilbertn.suse.de