Hello community,
here is the log from the commit of package NetworkManager-gnome for
openSUSE:Factory checked in at 2016-09-21 18:30:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-gnome (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-gnome"
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-gnome/NetworkManager-gnome.changes
2016-09-12 13:23:23.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-gnome.changes
2016-09-21 18:30:35.000000000 +0200
@@ -1,0 +2,76 @@
+Wed Sep 7 11:12:37 UTC 2016 - [email protected]
+
+- Update to version 1.4.0:
+ + Added support for multiple VPN connections.
+ + Added new pages for changing team and team-port configurations.
+ + Improved error reporting in the wireless security page.
+ + A single VPN plugins now supports the creation of multiple
+ connection types.
+ + Fixed some crashes.
+- Add pkgconfig(jansson) BuildRequires: new dependency for team
+ support.
+- Rebase NetworkManager-gnome-no-firewalld.patch.
+- No longer rename org.gnome.nm-connection-editor.appdata.xml to
+ nm-connection-editor.appdata.xml: this is fixed in the tarball
+ already.
+
+-------------------------------------------------------------------
+Wed Sep 7 11:12:36 UTC 2016 - [email protected]
+
+- Update to version 1.2.2:
+ + Connecting to multiple VPNs from the applet is now possible.
+ + A minor crash bugfix.
+ + Updated translations.
+- Drop NetworkManager-wrongly-placed-brace.patch: Fixed upstream.
+- Conditionally apply translations-update-upstream BuildRequires
+ and macro for non-openSUSE only.
+- Stop packaging AUTORS and README, they are empthy files.
+
+-------------------------------------------------------------------
+Wed Sep 7 11:12:35 UTC 2016 - [email protected]
+
+- Update to version 1.2.0:
+ + Appdata: fix the screenshot url.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed Sep 7 11:12:34 UTC 2016 - [email protected]
+
+- Update to version 1.1.93 (1.2-rc1):
+ + Updated translations.
+- Changes from version 1.1.92:
+ + Numerous crasher and memory leak bugs were fixed.
+- Add pkgconfig(dbusmenu-gtk3-0.4) BuildRequires: new dependency
+ for AppIndicator integration.
+
+-------------------------------------------------------------------
+Wed Sep 7 11:12:33 UTC 2016 - [email protected]
+
+- Update to version 1.1.91:
+ + Port to GDBus.
+ + Bugs fixed: bgo#686357, bgo#760866, bgo#760946, bgo#760966,
+ bgo#762421, rh#1279937, rh#1284671.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed Sep 7 11:12:32 UTC 2016 - [email protected]
+
+- Update to version 1.1.90:
+ + Ported to libnm.
+ + Added new libnm-based client library (libnma).
+ + Add support for libappindicator.
+- Add pkgconfig(libnm) BuildRequires: new dependency.
+- Disable nm-applet-private-connection.patch: needs rebase.
+- Rebase NetworkManager-gnome-no-firewalld.patch.
+- Flip with_cacert_patch off (set to 0): patch needs rebase.
+- Split the .ui files out of libnm-gtk0 into libnm-gtk-data, as
+ those files violate the SLPP, making it impossible to install
+ multiple versions of libnm-gtk.
+- Split out new subpackage for the new libnma library:
+ + libnma0, libnma-data, libnma-devel, typelib-1_0-NMA-1_0.
+- Unconditionally pass --with-appindicator to configure: this
+ support is now upstream supported. Remove 2nd spec file and
+ traces of the dual-spec setup.
+- Drop nm-applet-app-indicator.patch: no longer needed.
+
+-------------------------------------------------------------------
@@ -719,0 +796 @@
+
Old:
----
NetworkManager-appindicator.changes
NetworkManager-appindicator.spec
NetworkManager-wrongly-placed-brace.patch
network-manager-applet-1.0.10.tar.xz
nm-applet-app-indicator.patch
nm-icons-appindicator.tar.gz
pre_checkin.sh
New:
----
network-manager-applet-1.4.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-gnome.spec ++++++
--- /var/tmp/diff_new_pack.qWcvwf/_old 2016-09-21 18:30:36.000000000 +0200
+++ /var/tmp/diff_new_pack.qWcvwf/_new 2016-09-21 18:30:36.000000000 +0200
@@ -16,14 +16,12 @@
#
-%define build_appindicator 0
-
-%define with_cacert_patch 1
+%define with_cacert_patch 0
Name: NetworkManager-gnome
%define _name NetworkManager-gnome
Url: http://www.gnome.org/projects/NetworkManager/
-Version: 1.0.10
+Version: 1.4.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-devel
@@ -37,36 +35,33 @@
BuildRequires: libtool
# Needed by patch0
BuildRequires: polkit-devel
+%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
+%endif
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(NetworkManager) >= 1.0.0
+BuildRequires: pkgconfig(NetworkManager) >= 1.3
+BuildRequires: pkgconfig(appindicator3-0.1)
+BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) >= 16.04.0
BuildRequires: pkgconfig(gudev-1.0) >= 147
BuildRequires: pkgconfig(iso-codes)
-BuildRequires: pkgconfig(libnm-glib) >= 1.0.0
-BuildRequires: pkgconfig(libnm-glib-vpn) >= 1.0.0
-BuildRequires: pkgconfig(libnm-util) >= 1.0.0
+BuildRequires: pkgconfig(jansson) >= 2.3
+BuildRequires: pkgconfig(libnm) >= 1.3
+BuildRequires: pkgconfig(libnm-glib) >= 1.3
+BuildRequires: pkgconfig(libnm-glib-vpn) >= 1.3
+BuildRequires: pkgconfig(libnm-util) >= 1.3
BuildRequires: pkgconfig(libsecret-unstable)
BuildRequires: pkgconfig(mm-glib)
-%if %{build_appindicator}
-# For some reason Configure wants version 3, but to compile it needs version 1
-BuildRequires: pkgconfig(appindicator3-0.1)
-%endif
Summary: GNOME applications for use with NetworkManager
License: GPL-2.0+
Group: System/GUI/GNOME
-Source:
http://download.gnome.org/sources/network-manager-applet/1.0/network-manager-applet-%{version}.tar.xz
+Source:
http://download.gnome.org/sources/network-manager-applet/1.4/network-manager-applet-%{version}.tar.xz
Source1: nm-icons.tar.gz
-Source2: nm-icons-appindicator.tar.gz
-# PATCH-FIX-UPSTREAM nm-applet-private-connection.patch bnc#751211 bgo#646187
[email protected] -- Create private connections if the user is not
authorized. Allows to create wifi connections without root access. Patch under
discussion upstream.
+# PATCH-NEEDS-REBASE nm-applet-private-connection.patch bnc#751211 bgo#646187
[email protected] -- Create private connections if the user is not
authorized. Allows to create wifi connections without root access. Patch under
discussion upstream. (WAS: PATCH-FIX-UPSTREAM)
Patch0: nm-applet-private-connection.patch
# PATCH-NEEDS-REBASE nm-applet-probe-radius-server-cert.patch bnc#574266
[email protected] -- Probe the RADIUS server certificate (WAS: PATCH-FIX-UPSTREAM)
Patch1: nm-applet-probe-radius-server-cert.patch
# PATCH-FEATURE-UPSTREAM NetworkManager-gnome-no-firewalld.patch boo#897636
bgo#737687 [email protected] -- Allow to disable FirewallD integration
Patch2: NetworkManager-gnome-no-firewalld.patch
-# PATCH-FEATURE-UPSTREAM AppIndicator systray support
-Patch3: nm-applet-app-indicator.patch
-# PATCH-FIX-UPSTREAM NetworkManager-wrongly-placed-brace.patch
[email protected] -- Fix wrongly placed brace, taken from git
-Patch4: NetworkManager-wrongly-placed-brace.patch
Provides: NetworkManager-client
Requires: NetworkManager >= 0.9.3
# needed for translated country names
@@ -82,16 +77,10 @@
Recommends: NetworkManager-connection-editor
%glib2_gsettings_schema_requires
-%if %{build_appindicator}
-Conflicts: NetworkManager-gnome
-%else
-Conflicts: NetworkManager-appindicator
-%endif
%description
This package contains GNOME utilities and applications for use with
NetworkManager, including a panel applet for wireless networks.
-%if !%{build_appindicator}
%package -n NetworkManager-connection-editor
Summary: GUI to configure connections for NetworkManager
Group: System/GUI/GNOME
@@ -99,13 +88,58 @@
%description -n NetworkManager-connection-editor
NetworkManager Configuration tool - take control over your connection settings.
+%package -n libnma0
+Summary: NetworkManager UI dialog library
+Group: System/Libraries
+# the .ui files are split in case libnm-gtk ever bumps ABI
+Requires: libnma-data >= %{version}
+
+%description -n libnma0
+This library provides UI dialogs for NetworkManager integration.
+
+%package -n libnma-data
+Summary: NetworkManager UI dialogs
+Group: System/Libraries
+
+%description -n libnma-data
+This package provides GTK+ dialogs for NetworkManager integration.
+
+%package -n typelib-1_0-NMA-1_0
+Summary: NetworkManager UI dialogs -- Introspection bindings
+Group: System/Libraries
+
+%description -n typelib-1_0-NMA-1_0
+This library provides GTK+ dialogs for NetworkManager integration
+provided as introspection bindings.
+
+%package -n libnma-devel
+Summary: NetworkManager UI dialogs -- Development Files
+Group: Development/Libraries/GNOME
+Requires: libnma0 = %{version}
+Requires: typelib-1_0-NMA-1_0 = %{version}
+
+%description -n libnma-devel
+This library provides GTK+ dialogs for NetworkManager integration.
+
%package -n libnm-gtk0
-Summary: NetworkManager Gtk+ dialogs
+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}
%description -n libnm-gtk0
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
@@ -122,21 +156,19 @@
%description -n libnm-gtk-devel
This library provides GTK+ dialogs for NetworkManager integration.
-%endif
%lang_package
%prep
-%setup -q -n network-manager-applet-%{version} -a 1 -a 2
-%patch0 -p1
+%setup -q -n network-manager-applet-%{version} -a 1
+#Needs rebase
+#patch0 -p1
%if %{with_cacert_patch}
%patch1 -p1
%endif
%patch2 -p1
-%if %{build_appindicator}
-%patch3 -p1
+%if !0%{?is_opensuse}
+translation-update-upstream
%endif
-%patch4 -p1
-##translation-update-upstream
%build
# Needed for patch0
@@ -145,47 +177,19 @@
--disable-static \
--disable-maintainer-mode \
--disable-migration \
-%if %{build_appindicator}
--with-appindicator \
-%endif
- --without-firewalld
+ %nil
%__make %{?_smp_mflags}
%install
%makeinstall
find %{buildroot}%{_libdir} -name '*.la' -delete -print
# align the name of the appdata file with the name of the .desktop file
-mv %{buildroot}%{_datadir}/appdata/org.gnome.nm-connection-editor.appdata.xml \
- %{buildroot}%{_datadir}/appdata/nm-connection-editor.appdata.xml
%suse_update_desktop_file
%{buildroot}%{_datadir}/applications/nm-applet.desktop
%suse_update_desktop_file
%{buildroot}%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%suse_update_desktop_file -r nm-connection-editor GTK GNOME System
X-SuSE-ServiceConfiguration
-%if !%{build_appindicator}
%find_lang nm-applet %{?no_lang_C}
cp -r nm-icons/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-%else
-cp -r nm-icons-appindicator/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-mkdir -p %{buildroot}/%{_docdir}/%{name}/
-mv %{buildroot}%{_datadir}/icons/hicolor/COPYING
%{buildroot}/%{_docdir}/COPYING.icons
-mv %{buildroot}%{_datadir}/icons/hicolor/CREDITS
%{buildroot}/%{_docdir}/CREDITS.icons
-
-# Remove files from packages built in NetworkManager-gnome
-rm %{buildroot}%{_libdir}/libnm-gtk.so.*
-rm -r %{buildroot}%{_datadir}/libnm-gtk/
-
-rm %{buildroot}%{_libdir}/girepository-1.0/NMGtk-1.0.typelib
-
-rm %{buildroot}%{_datadir}/gir-1.0/NMGtk-1.0.gir
-rm -r %{buildroot}%{_includedir}/libnm-gtk/
-rm %{buildroot}%{_libdir}/libnm-gtk.so
-rm %{buildroot}%{_libdir}/pkgconfig/libnm-gtk.pc
-
-rm -r %{buildroot}%{_datadir}/locale/
-
-# nm-connection-editor is built as a separate package and can be shared
-find %{buildroot} -name 'nm-connection-editor*' -delete -print
-
-%endif
%post
%glib2_gsettings_schema_post
@@ -197,15 +201,15 @@
%desktop_database_postun
%icon_theme_cache_postun
-%if !%{build_appindicator}
%post -n libnm-gtk0 -p /sbin/ldconfig
-
%postun -n libnm-gtk0 -p /sbin/ldconfig
-%endif
+
+%post -n libnma0 -p /sbin/ldconfig
+%postun -n libnma0 -p /sbin/ldconfig
%files
%defattr(-,root,root)
-%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING
+%doc COPYING ChangeLog NEWS CONTRIBUTING
%{_mandir}/man1/nm-applet.1%{?ext_man}
%{_bindir}/nm-applet
%{_datadir}/nm-applet
@@ -217,12 +221,7 @@
%{_datadir}/icons/hicolor/*/apps/*.svg
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%{_datadir}/applications/nm-applet.desktop
-%if %{build_appindicator}
-%{_docdir}/*
-%{_datadir}/icons/hicolor/*/status/*.png
-%endif
-%if !%{build_appindicator}
%files -n NetworkManager-connection-editor
%defattr(-,root,root)
%{_bindir}/nm-connection-editor
@@ -236,6 +235,9 @@
%files -n libnm-gtk0
%defattr(-,root,root)
%{_libdir}/libnm-gtk.so.*
+
+%files -n libnm-gtk-data
+%defattr(-,root,root)
%{_datadir}/libnm-gtk/
%files -n typelib-1_0-NMGtk-1_0
@@ -249,7 +251,25 @@
%{_libdir}/libnm-gtk.so
%{_libdir}/pkgconfig/libnm-gtk.pc
+%files -n libnma0
+%defattr(-,root,root)
+%{_libdir}/libnma.so.*
+
+%files -n typelib-1_0-NMA-1_0
+%defattr(-,root,root)
+%{_libdir}/girepository-1.0/NMA-1.0.typelib
+
+%files -n libnma-data
+%defattr(-,root,root)
+%{_datadir}/libnma/
+
+%files -n libnma-devel
+%defattr(-,root,root)
+%{_includedir}/libnma/
+%{_libdir}/libnma.so
+%{_libdir}/pkgconfig/libnma.pc
+%{_datadir}/gir-1.0/NMA-1.0.gir
+
%files lang -f nm-applet.lang
-%endif
%changelog
++++++ NetworkManager-gnome-no-firewalld.patch ++++++
--- /var/tmp/diff_new_pack.qWcvwf/_old 2016-09-21 18:30:36.000000000 +0200
+++ /var/tmp/diff_new_pack.qWcvwf/_new 2016-09-21 18:30:36.000000000 +0200
@@ -17,27 +17,27 @@
src/connection-editor/page-general.c | 16 ++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
-Index: network-manager-applet-1.0.0/configure.ac
+Index: network-manager-applet-1.4.0/configure.ac
===================================================================
---- network-manager-applet-1.0.0.orig/configure.ac
-+++ network-manager-applet-1.0.0/configure.ac
-@@ -151,6 +151,11 @@ esac
+--- network-manager-applet-1.4.0.orig/configure.ac
++++ network-manager-applet-1.4.0/configure.ac
+@@ -110,6 +110,11 @@ fi
AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
+AC_ARG_WITH([firewalld],
-+ AS_HELP_STRING([--with-firewalld|--without-firewalld], [Enable
firewalld integration support]),
-+ with_firewalld="$withval",with_firewalld=yes)
++ AS_HELP_STRING([--with-firewalld|--without-firewalld], [Enable
firewalld integration support]),
++ with_firewalld="$withval",with_firewalld=yes)
+AM_CONDITIONAL(HAVE_FIREWALLD, test x"with_firewalld" = "xyes")
+
- dnl ModemManager1 with libmm-glib
- AC_ARG_WITH(modem-manager-1, AS_HELP_STRING([--with-modem-manager-1], [Enable
new ModemManager1 interface support]),,[with_modem_manager_1=auto])
- if (test "${with_modem_manager_1}" != "no"); then
-Index: network-manager-applet-1.0.0/src/connection-editor/page-general.c
+ 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
===================================================================
---- network-manager-applet-1.0.0.orig/src/connection-editor/page-general.c
-+++ network-manager-applet-1.0.0/src/connection-editor/page-general.c
-@@ -63,6 +63,7 @@ enum {
+--- 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 {
N_COLUMNS
};
@@ -45,9 +45,9 @@
static void populate_firewall_zones_ui (CEPageGeneral *self);
static void
-@@ -115,17 +116,19 @@ get_zones_from_firewall (CEPageGeneral *
- dbus_g_connection_unref (bus);
- }
+@@ -125,16 +126,19 @@ on_fw_proxy_acquired (GObject *object, G
+ (GAsyncReadyCallback) get_zones_cb,
+ self);
}
+#endif
@@ -59,15 +59,14 @@
+ builder = CE_PAGE (self)->builder;
+
+#if 0
- GtkWidget *align;
+ GtkWidget *vbox;
GtkLabel *label;
- builder = CE_PAGE (self)->builder;
--
+
/*-- Firewall zone --*/
priv->firewall_zone = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new ());
-
-@@ -139,6 +142,7 @@ general_private_init (CEPageGeneral *sel
+@@ -158,6 +162,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));
@@ -75,10 +74,11 @@
/*-- Dependent VPN connection --*/
priv->dependent_vpn_checkbox = GTK_TOGGLE_BUTTON
(gtk_builder_get_object (builder, "dependent_vpn_checkbox"));
-@@ -155,8 +159,9 @@ dispose (GObject *object)
- CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (object);
-
- g_clear_object (&priv->remote_settings);
+@@ -178,9 +183,9 @@ dispose (GObject *object)
+ g_clear_object (&priv->cancellable);
+ }
+ g_clear_object (&priv->fw_proxy);
+-
+#if 0
g_clear_pointer (&priv->zones, g_strfreev);
-
@@ -86,7 +86,7 @@
G_OBJECT_CLASS (ce_page_general_parent_class)->dispose (object);
}
-@@ -175,6 +180,7 @@ vpn_checkbox_toggled (GtkToggleButton *b
+@@ -199,6 +204,7 @@ vpn_checkbox_toggled (GtkToggleButton *b
ce_page_changed (CE_PAGE (user_data));
}
@@ -94,7 +94,7 @@
static void
populate_firewall_zones_ui (CEPageGeneral *self)
{
-@@ -213,6 +219,7 @@ populate_firewall_zones_ui (CEPageGenera
+@@ -237,6 +243,7 @@ populate_firewall_zones_ui (CEPageGenera
stuff_changed (NULL, self);
}
@@ -102,7 +102,7 @@
static void
populate_ui (CEPageGeneral *self)
-@@ -225,9 +232,11 @@ populate_ui (CEPageGeneral *self)
+@@ -250,9 +257,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);
-@@ -289,7 +298,9 @@ finish_setup (CEPageGeneral *self, gpoin
+@@ -314,7 +323,9 @@ finish_setup (CEPageGeneral *self, gpoin
populate_ui (self);
++++++ network-manager-applet-1.0.10.tar.xz ->
network-manager-applet-1.4.0.tar.xz ++++++
++++ 477267 lines of diff (skipped)
