packages/network-manager-applet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wcc_140409/network-manager-applet

Browse Source 
Conflicts:
	network-manager-applet.spec
This commit is contained in:
19909236985 2020-07-25 17:05:27 +08:00
commit f90cf5a50c
3 changed files with 58 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
0001-nm-applet-no-notifications.patch
View File

@ -1,13 +0,0 @@
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index 9e2887e..4f8c16a 100644
--- a/org.gnome.nm-applet.gschema.xml.in
+++ b/org.gnome.nm-applet.gschema.xml.in
@@ -17,7 +17,7 @@
<description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</description>
</key>
<key name="suppress-wireless-networks-available" type="b">
- <default>false</default>
+ <default>true</default>
<summary>Suppress networks available notifications</summary>
<description>Set this to true to disable notifications when Wi-Fi networks are available.</description>
</key>

BIN
network-manager-applet-1.8.22.tar.xz
View File

Binary file not shown.

110
network-manager-applet.spec
View File

@ -1,67 +1,69 @@
%global gtk3_version %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad)
%global gtk4_version %(pkg-config --modversion gtk4 2>/dev/null || echo bad)
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
<<<<<<< HEAD
%global nm_version 1:1.16.0
%global libnma_version 1.8.27
%global obsoletes_ver 1:0.9.7
%global rpm_version 1.18.0
%global real_version 1.18.0
%global release_version 1
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
%if 0%{?fedora} > 31 || 0%{?rhel} > 8
%bcond_with libnma_gtk4
%else
%bcond_without libnma_gtk4
%bcond_with libnm_gtk
Name: network-manager-applet
Version: 1.18.0
Release: 0
Summary: NetworkManager GUI tools
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager
Source0: https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/%{version}/network-manager-applet-%{version}.tar.bz2
Requires: NetworkManager libnotify
Requires: libnma = %{version}-%{release}
Requires: nm-connection-editor = %{version}-%{release}
%if %{with libnm_gtk}
BuildRequires: NetworkManager-devel
BuildRequires: NetworkManager-glib-devel
%endif
BuildRequires: ModemManager-glib-devel NetworkManager-libnm-devel glib2-devel desktop-file-utils
BuildRequires: gettext-devel gobject-introspection-devel gtk-doc intltool meson gcr-devel gtk3-devel
BuildRequires: iso-codes-devel jansson-devel libgudev-devel libnotify-devel libsecret-devel libxslt
BuildRequires: libselinux-devel mobile-broadband-provider-info-devel pkgconfig /usr/bin/autopoint
%description
A network control and status applet for NetworkManager
%package -n nm-connection-editor
Summary: A network connection configuration editor for NetworkManager
%description -n nm-connection-editor
This package contains a network configuration editor and Bluetooth modem
utility for use with NetworkManager.
%package -n libnm-gtk
Summary: Private libraries for %{name}
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < 1:0.9.7
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: %{rpm_version}
Release: %{release_version}%{?dist}
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
%description -n libnm-gtk
This package contains private libraries to be used only by nm-applet,
nm-connection editor, and the GNOME Control Center.
Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
%package -n libnm-gtk-devel
Summary: Private header files for %{name}
Requires: NetworkManager-devel NetworkManager-glib-devel
Obsoletes: NetworkManager-gtk-devel < 1:0.9.7
Requires: libnm-gtk = %{version}-%{release}
Requires: gtk3-devel pkgconfig
Requires: NetworkManager >= %{nm_version}
Requires: libnotify >= 0.4.3
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
Requires: libnma%{?_isa} >= %{libnma_version}
BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
BuildRequires: libnma-devel >= %{libnma_version}
BuildRequires: ModemManager-glib-devel >= 1.0
BuildRequires: glib2-devel >= 2.32
BuildRequires: gtk3-devel >= 3.10
%if %{with libnma_gtk4}
BuildRequires: gtk4-devel >= 3.96
%endif
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: /usr/bin/autopoint
BuildRequires: pkgconfig
BuildRequires: libnotify-devel >= 0.4
BuildRequires: meson
BuildRequires: intltool
BuildRequires: gtk-doc
BuildRequires: desktop-file-utils
BuildRequires: iso-codes-devel
BuildRequires: libgudev1-devel >= 147
BuildRequires: libsecret-devel >= 0.12
BuildRequires: jansson-devel
BuildRequires: gcr-devel
BuildRequires: libselinux-devel
BuildRequires: mobile-broadband-provider-info-devel
BuildRequires: libappindicator-gtk3-devel
BuildRequires: libdbusmenu-gtk3-devel
%description -n libnma-devel
%description -n libnm-gtk-devel
This package contains private header and pkg-config files to be used only by
nm-applet, nm-connection-editor, and the GNOME control center.
GNOME control center.This package is obsoleted by libnma.
This package deprecates libnm-gtk.
@ -154,7 +156,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_mandir}/man1/nm-connection-editor*
%changelog
<<<<<<< HEAD
* Mon Jun 22 2020 Adam Williamson <awilliam@redhat.com> - 1.18.0-1
=======
* Mon Jun 22 2020 Adam Williamson <awilliam@redhat.com> - 1.18.0-0
>>>>>>> 19109fbb5c4965669031449ed4460cd6032ba9af
- Update to 1.18.0
* Thu Nov 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.8.22-2