Hello community,
here is the log from the commit of package NetworkManager-applet for
openSUSE:Factory checked in at 2019-12-11 12:05:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-applet (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-applet.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-applet"
Wed Dec 11 12:05:28 2019 rev:28 rq:754986 version:1.8.25+20
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-applet/NetworkManager-applet.changes
2019-10-17 13:04:29.940512817 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-applet.new.4691/NetworkManager-applet.changes
2019-12-11 12:05:47.200723657 +0100
@@ -1,0 +2,28 @@
+Thu Dec 05 13:29:06 UTC 2019 - [email protected]
+
+- Update to version 1.8.25+20:
+ + appdata:
+ - add release tag
+ - add OARS rating
+ + applet: scale icons for HiDPI displays
+ + libnma: drop it
+ + gitlab: drag in new enough libnma
+ + Updated translations.
+- Switch to git checkout via source service.
+- Drop no longer built sub packages:
+ + libnma0
+ + typelib-1_0-NMA-1_0
+ + libnma-devel
+- Switch to meson build system, add BuildRequires:
+ + pkgconfig(libnma)
+ + pkgconfig(gio-2.0)
+ + pkgconfig(gmodule-export-2.0)
+- Drop no longer needed BuildRequires:
+ + gtk-doc
+ + intltool
+ + pkgconfig(gobject-introspection-1.0)
+ + pkgconfig(gck-1)
+ + pkgconfig(gcr-3)
+- Cleanup spec and rebase patches.
+
+-------------------------------------------------------------------
Old:
----
network-manager-applet-1.8.24.tar.xz
New:
----
_service
_servicedata
network-manager-applet-1.8.25+20.obscpio
network-manager-applet.obsinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-applet.spec ++++++
--- /var/tmp/diff_new_pack.jMltnP/_old 2019-12-11 12:05:50.996722061 +0100
+++ /var/tmp/diff_new_pack.jMltnP/_new 2019-12-11 12:05:51.000722059 +0100
@@ -1,7 +1,7 @@
#
# spec file for package NetworkManager-applet
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,22 @@
#
-%define sover 0
%define _name network-manager-applet
%if 0%{?is_opensuse}
%bcond_without appindicator
%else
%bcond_with appindicator
%endif
-%bcond_with meson
+
Name: NetworkManager-applet
-Version: 1.8.24
+Version: 1.8.25+20
Release: 0
Summary: GTK+ tray applet for use with NetworkManager
License: GPL-2.0-or-later
Group: System/GUI/GNOME
-Url: https://gnome.org/projects/NetworkManager
-Source0:
https://download.gnome.org/sources/network-manager-applet/1.8/%{_name}-%{version}.tar.xz
+URL: https://gnome.org/projects/NetworkManager
+Source0: %{_name}-%{version}.tar.xz
+
# PATCH-NEEDS-REBASE nm-applet-private-connection.patch boo#751211 bgo#646187
[email protected] -- Create private connections if the user is not
authorised. Allows to create wifi connections without root access. Patch under
discussion upstream. (WAS: PATCH-FIX-UPSTREAM)
Patch0: nm-applet-private-connection.patch
# PATCH-FIX-OPENSUSE
NetworkManager-gnome-bsc1003069-default-agent-owned-secrets.patch bsc#1003069
[email protected] -- Make sure secrets default to agent-owned (encrypted keyring).
@@ -39,21 +39,20 @@
# PATCH-FIX-UPSTREAM feature-app-indicator-desktop-file.patch [email protected]
-- nm-applet needs to be launched with --indicator and needs a startup delay
incase its started before the systray
Patch2: feature-app-indicator-desktop-file.patch
-BuildRequires: gtk-doc
-BuildRequires: intltool
+BuildRequires: meson >= 0.43.0
BuildRequires: pkgconfig
# Needed by Patch0.
-BuildRequires: polkit-devel
+#BuildRequires: polkit-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(gck-1) >= 3.14
-BuildRequires: pkgconfig(gcr-3) >= 3.14
-BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gmodule-export-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.10
BuildRequires: pkgconfig(gudev-1.0) >= 147
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(jansson) >= 2.3
BuildRequires: pkgconfig(libnm) >= 1.7
+BuildRequires: pkgconfig(libnma)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libsecret-1) >= 0.18
BuildRequires: pkgconfig(mm-glib)
@@ -75,11 +74,7 @@
Obsoletes: NetworkManager-gnome-debuginfo
Obsoletes: NetworkManager-gnome-lang < %{version}
Provides: NetworkManager-gnome-lang = %{version}
-%if %{with meson}
-BuildRequires: meson >= 0.43.0
-%else
-BuildRequires: libtool
-%endif
+
%if %{with appindicator}
BuildRequires: pkgconfig(appindicator3-0.1)
BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) >= 16.04.0
@@ -97,42 +92,16 @@
NetworkManager Configuration tool - take control over your
connection settings.
-%package -n libnma%{sover}
-Summary: NetworkManager UI dialog library
-Group: System/Libraries
-Requires: nma-data >= %{version}
-
-%description -n libnma%{sover}
-This library provides UI dialogs for NetworkManager integration.
-
%package -n nma-data
Summary: NetworkManager UI dialogs
Group: System/Libraries
Obsoletes: libnma-data < %{version}
Provides: libnma-data = %{version}
BuildArch: noarch
-%glib2_gsettings_schema_requires
%description -n nma-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.
-
%lang_package
%prep
@@ -146,57 +115,19 @@
translation-update-upstream po nm-applet
%build
-%if %{with meson}
%meson \
-%if %{with appindicator}
- -Dappindicator=true \
-%endif
+ -Dappindicator=yes \
-Dselinux=false \
-Dintrospection=true \
-Dlibnm_gtk=false \
%{nil}
%meson_build
-%else
-autoreconf -fiv
-%configure \
- --disable-static \
-%if %{with appindicator}
- --with-appindicator \
-%endif
- --without-selinux \
- --without-libnm-gtk
-%make_build
-%endif
%install
-%if %{with meson}
%meson_install
-%else
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-%endif
%suse_update_desktop_file -r nm-connection-editor GTK GNOME System
X-SuSE-ServiceConfiguration
%find_lang nm-applet %{?no_lang_C}
-%if 0%{?suse_version} < 1330
-%post
-%desktop_database_post
-%icon_theme_cache_post
-
-%post -n nma-data
-%glib2_gsettings_schema_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-
-%postun -n nma-data
-%glib2_gsettings_schema_postun
-%endif
-
-%post -n libnma%{sover} -p /sbin/ldconfig
-%postun -n libnma%{sover} -p /sbin/ldconfig
-
%files
%license COPYING
%doc CONTRIBUTING NEWS
@@ -215,21 +146,8 @@
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
%{_mandir}/man1/nm-connection-editor.1%{?ext_man}
-%files -n libnma%{sover}
-%{_libdir}/libnma.so.%{sover}*
-
-%files -n typelib-1_0-NMA-1_0
-%{_libdir}/girepository-1.0/NMA-1.0.typelib
-
%files -n nma-data
%{_datadir}/GConf/gsettings/nm-applet.convert
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
-%files -n libnma-devel
-%doc %{_datadir}/gtk-doc/html/libnma/
-%{_includedir}/libnma/
-%{_libdir}/libnma.so
-%{_libdir}/pkgconfig/libnma.pc
-%{_datadir}/gir-1.0/NMA-1.0.gir
-
%changelog
++++++ NetworkManager-gnome-bsc1003069-default-agent-owned-secrets.patch ++++++
--- /var/tmp/diff_new_pack.jMltnP/_old 2019-12-11 12:05:51.056722036 +0100
+++ /var/tmp/diff_new_pack.jMltnP/_new 2019-12-11 12:05:51.060722034 +0100
@@ -1,25 +1,8 @@
-Index: network-manager-applet-1.8.22/src/libnm-gtk/nm-ui-utils.c
+Index: network-manager-applet-1.8.25+20/src/wireless-security/eap-method-leap.c
===================================================================
---- network-manager-applet-1.8.22.orig/src/libnm-gtk/nm-ui-utils.c
2019-03-29 15:00:12.000000000 +0100
-+++ network-manager-applet-1.8.22/src/libnm-gtk/nm-ui-utils.c 2019-05-29
23:05:47.795471475 +0200
-@@ -868,8 +868,10 @@ nma_utils_setup_password_storage (GtkWid
- gtk_menu_attach_to_widget (GTK_MENU (popup_menu), passwd_entry, NULL);
-
- /* Initialize active item for password-storage popup menu */
-- if (setting && password_flags_name)
-- nm_setting_get_secret_flags (setting, password_flags_name,
&secret_flags, NULL);
-+ if (setting && password_flags_name) {
-+ if (!nm_setting_get_secret_flags (setting, password_flags_name,
&secret_flags, NULL))
-+ secret_flags = initial_flags;
-+ }
- else
- secret_flags = initial_flags;
-
-Index: network-manager-applet-1.8.22/src/wireless-security/eap-method-leap.c
-===================================================================
---- network-manager-applet-1.8.22.orig/src/wireless-security/eap-method-leap.c
2019-03-29 15:00:12.000000000 +0100
-+++ network-manager-applet-1.8.22/src/wireless-security/eap-method-leap.c
2019-05-29 23:05:47.795471475 +0200
-@@ -241,7 +241,7 @@ eap_method_leap_new (WirelessSecurity *w
+---
network-manager-applet-1.8.25+20.orig/src/wireless-security/eap-method-leap.c
++++ network-manager-applet-1.8.25+20/src/wireless-security/eap-method-leap.c
+@@ -227,7 +227,7 @@ eap_method_leap_new (WirelessSecurity *w
/* Create password-storage popup menu for password entry under entry's
secondary icon */
if (connection)
s_8021x = nm_connection_get_setting_802_1x (connection);
@@ -28,11 +11,11 @@
FALSE, secrets_only);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"show_checkbutton_eapleap"));
-Index: network-manager-applet-1.8.22/src/wireless-security/eap-method-simple.c
+Index:
network-manager-applet-1.8.25+20/src/wireless-security/eap-method-simple.c
===================================================================
----
network-manager-applet-1.8.22.orig/src/wireless-security/eap-method-simple.c
2019-05-24 11:49:21.000000000 +0200
-+++ network-manager-applet-1.8.22/src/wireless-security/eap-method-simple.c
2019-05-29 23:05:47.795471475 +0200
-@@ -431,7 +431,7 @@ eap_method_simple_new (WirelessSecurity
+---
network-manager-applet-1.8.25+20.orig/src/wireless-security/eap-method-simple.c
++++ network-manager-applet-1.8.25+20/src/wireless-security/eap-method-simple.c
+@@ -417,7 +417,7 @@ eap_method_simple_new (WirelessSecurity
/* Create password-storage popup menu for password entry under entry's
secondary icon */
if (connection)
s_8021x = nm_connection_get_setting_802_1x (connection);
@@ -41,11 +24,11 @@
FALSE, flags &
EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY);
g_signal_connect (method->password_entry, "notify::secondary-icon-name",
-Index: network-manager-applet-1.8.22/src/wireless-security/ws-leap.c
+Index: network-manager-applet-1.8.25+20/src/wireless-security/ws-leap.c
===================================================================
---- network-manager-applet-1.8.22.orig/src/wireless-security/ws-leap.c
2019-05-24 11:49:21.000000000 +0200
-+++ network-manager-applet-1.8.22/src/wireless-security/ws-leap.c
2019-05-29 23:05:47.795471475 +0200
-@@ -192,7 +192,7 @@ ws_leap_new (NMConnection *connection, g
+--- network-manager-applet-1.8.25+20.orig/src/wireless-security/ws-leap.c
++++ network-manager-applet-1.8.25+20/src/wireless-security/ws-leap.c
+@@ -178,7 +178,7 @@ ws_leap_new (NMConnection *connection, g
sec);
/* Create password-storage popup menu for password entry under entry's
secondary icon */
@@ -54,11 +37,11 @@
FALSE, secrets_only);
if (wsec)
-Index: network-manager-applet-1.8.22/src/wireless-security/ws-wep-key.c
+Index: network-manager-applet-1.8.25+20/src/wireless-security/ws-wep-key.c
===================================================================
---- network-manager-applet-1.8.22.orig/src/wireless-security/ws-wep-key.c
2019-05-24 11:49:21.000000000 +0200
-+++ network-manager-applet-1.8.22/src/wireless-security/ws-wep-key.c
2019-05-29 23:05:47.795471475 +0200
-@@ -286,7 +286,7 @@ ws_wep_key_new (NMConnection *connection
+--- network-manager-applet-1.8.25+20.orig/src/wireless-security/ws-wep-key.c
++++ network-manager-applet-1.8.25+20/src/wireless-security/ws-wep-key.c
+@@ -272,7 +272,7 @@ ws_wep_key_new (NMConnection *connection
/* Create password-storage popup menu for password entry under entry's
secondary icon */
if (connection)
setting = (NMSetting *)
nm_connection_get_setting_wireless_security (connection);
@@ -67,11 +50,11 @@
FALSE, secrets_only);
if (connection) {
-Index: network-manager-applet-1.8.22/src/wireless-security/ws-wpa-psk.c
+Index: network-manager-applet-1.8.25+20/src/wireless-security/ws-wpa-psk.c
===================================================================
---- network-manager-applet-1.8.22.orig/src/wireless-security/ws-wpa-psk.c
2019-05-24 11:49:21.000000000 +0200
-+++ network-manager-applet-1.8.22/src/wireless-security/ws-wpa-psk.c
2019-05-29 23:05:47.795471475 +0200
-@@ -207,7 +207,7 @@ ws_wpa_psk_new (NMConnection *connection
+--- network-manager-applet-1.8.25+20.orig/src/wireless-security/ws-wpa-psk.c
++++ network-manager-applet-1.8.25+20/src/wireless-security/ws-wpa-psk.c
+@@ -189,7 +189,7 @@ ws_wpa_psk_new (NMConnection *connection
/* Create password-storage popup menu for password entry under entry's
secondary icon */
if (connection)
setting = (NMSetting *)
nm_connection_get_setting_wireless_security (connection);
++++++ _service ++++++
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="disabled">
<param
name="url">https://gitlab.gnome.org/GNOME/network-manager-applet.git</param>
<param name="scm">git</param>
<param name="revision">74183667</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)dev</param>
<param name="changesgenerate">enable</param>
</service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="disabled" name="set_version" />
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param
name="url">https://gitlab.gnome.org/GNOME/network-manager-applet.git</param>
<param
name="changesrevision">74183667c082b9a6717f0748e6ce64c2986b4667</param></service></servicedata>++++++
network-manager-applet.obsinfo ++++++
name: network-manager-applet
version: 1.8.25+20
mtime: 1575014001
commit: 74183667c082b9a6717f0748e6ce64c2986b4667
