rpms/network-manager-applet
5
0
Fork 0
Code Issues Pull Requests Releases Activity

import network-manager-applet-1.18.0-1.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-07-14 01:41:39 +00:00 committed by Stepan Oksanichenko
parent 9bad82e47b
commit a2150c6990
6 changed files with 26 additions and 3509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/network-manager-applet-1.8.22.tar.xz
SOURCES/network-manager-applet-1.18.0.tar.xz

2
.network-manager-applet.metadata
View File

@ -1 +1 @@
052e371469ed3840a9b9015001e3bc2873c5a962 SOURCES/network-manager-applet-1.8.22.tar.xz
6d79ca3373212df29e20fbcc49a6ab33d01c3120 SOURCES/network-manager-applet-1.18.0.tar.xz

13
SOURCES/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>

3232
SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch
View File

File diff suppressed because it is too large Load Diff

151
SOURCES/0003-drop-gschema.patch
View File

@ -1,151 +0,0 @@
From 446e1936f5798ba38683fe910469ad995abfdfa8 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 18 May 2020 17:04:37 +0200
Subject: [PATCH] gschema: move "org.gnome.nm-applet.gschema.xml" from
network-manager-applet to libnma
The schema is also used by libnma's "src/nma-ws/nma-eap.c" (formerly
"src/wireless-security/eap-method.c") and g-c-c's
"panels/network/wireless-security/eap-method.c".
That means, despite the name of the schema, it really belongs to libnma.
Move it to libnma ([1]).
[1] https://gitlab.gnome.org/GNOME/libnma/-/commit/50cda26ae4beab31f30fb93fd36a7bcc5435adc1
See-also: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/881
See-also: https://gitlab.gnome.org/GNOME/libnma/-/merge_requests/11
(cherry-picked from commit 6b1aaade74cf9d2cc5f02433cf34525b279011de)
---
Makefile.am | 3 --
configure.ac | 1 -
meson.build | 13 --------
org.gnome.nm-applet.gschema.xml.in | 52 ------------------------------
po/POTFILES.in | 1 -
5 files changed, 70 deletions(-)
delete mode 100644 org.gnome.nm-applet.gschema.xml.in
diff --git a/Makefile.am b/Makefile.am
index c863e8d4..09d258af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1128,9 +1128,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
nm-connection-editor.desktop: nm-connection-editor.desktop.in
$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
-@GSETTINGS_RULES@
-
appdatadir = $(datadir)/metainfo
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = nm-connection-editor.appdata.xml.in
diff --git a/configure.ac b/configure.ac
index 5f6a24c0..2144415d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,7 +339,6 @@ src/libnma/libnma.pc
po/Makefile.in
man/nm-applet.1
man/nm-connection-editor.1
-org.gnome.nm-applet.gschema.xml
src/libnma/nma-version.h
])
AC_OUTPUT
diff --git a/meson.build b/meson.build
index cf5d02f7..7f7ad12e 100644
--- a/meson.build
+++ b/meson.build
@@ -419,19 +419,6 @@ if appstream_util.found()
)
endif
-schema_conf = configuration_data()
-schema_conf.set('GETTEXT_PACKAGE', nma_name)
-
-schema = 'org.gnome.nm-applet.gschema.xml'
-
-configure_file(
- input: schema + '.in',
- output: schema,
- install: true,
- install_dir: join_paths(nma_datadir, 'glib-2.0', 'schemas'),
- configuration: schema_conf
-)
-
install_data(
'nm-applet.convert',
install_dir: join_paths(nma_datadir, 'GConf', 'gsettings')
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
deleted file mode 100644
index 4f8c16af..00000000
--- a/org.gnome.nm-applet.gschema.xml.in
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
- <schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/" gettext-domain="@GETTEXT_PACKAGE@">
- <key name="disable-connected-notifications" type="b">
- <default>false</default>
- <summary>Disable connected notifications</summary>
- <description>Set this to true to disable notifications when connecting to a network.</description>
- </key>
- <key name="disable-disconnected-notifications" type="b">
- <default>false</default>
- <summary>Disable disconnected notifications</summary>
- <description>Set this to true to disable notifications when disconnecting from a network.</description>
- </key>
- <key name="disable-vpn-notifications" type="b">
- <default>false</default>
- <summary>Disable VPN notifications</summary>
- <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>true</default>
- <summary>Suppress networks available notifications</summary>
- <description>Set this to true to disable notifications when Wi-Fi networks are available.</description>
- </key>
- <key name="stamp" type="i">
- <default>0</default>
- <summary>Stamp</summary>
- <description>Used to determine whether settings should be migrated to a new version.</description>
- </key>
- <key name="disable-wifi-create" type="b">
- <default>false</default>
- <summary>Disable WiFi Create</summary>
- <description>Set to true to disable creation of adhoc networks when using the applet.</description>
- </key>
- <key name="show-applet" type="b">
- <default>true</default>
- <summary>Show the applet in notification area</summary>
- <description>Set to FALSE to disable displaying the applet in the notification area.</description>
- </key>
- </schema>
- <schema id="org.gnome.nm-applet.eap">
- <key name="ignore-ca-cert" type="b">
- <default>false</default>
- <summary>Ignore CA certificate</summary>
- <description>Set this to true to disable warnings about CA certificates in EAP authentication.</description>
- </key>
- <key name="ignore-phase2-ca-cert" type="b">
- <default>false</default>
- <summary>Ignore CA certificate</summary>
- <description>Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication.</description>
- </key>
- </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 31cfdef8..7a7b546d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
# Please keep this file sorted alphabetically.
nm-applet.desktop.in
nm-connection-editor.desktop.in
-org.gnome.nm-applet.gschema.xml.in
nm-connection-editor.appdata.xml.in
shared/nm-utils/nm-shared-utils.c
src/8021x.ui
--
2.25.3

135
SPECS/network-manager-applet.spec
View File

@ -1,18 +1,20 @@
%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)
%global nm_version 1:1.1.0
%global nm_version 1:1.16.0
%global libnma_version 1.8.27
%global obsoletes_ver 1:0.9.7
%global rpm_version 1.8.22
%global real_version 1.8.22
%global release_version 3
%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} > 28 || 0%{?rhel} > 7
%bcond_with libnm_gtk
%if 0%{?fedora} > 31 || 0%{?rhel} > 7
%bcond_with libnma_gtk4
%else
%bcond_without libnm_gtk
%bcond_without libnma_gtk4
%endif
Name: network-manager-applet
@ -25,23 +27,21 @@ URL: http://www.gnome.org/projects/NetworkManager/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
Patch1: 0001-nm-applet-no-notifications.patch
Patch2: 0001-po-RHEL-8.1-translations-rh1690001.patch
Patch3: 0003-drop-gschema.patch
#Patch1: 0001-some.patch
Requires: NetworkManager >= %{nm_version}
Requires: libnotify >= 0.4.3
Requires: nm-connection-editor = %{version}-%{release}
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
Requires: libnma%{?_isa} >= %{libnma_version}
%if %{with libnm_gtk}
BuildRequires: NetworkManager-devel >= %{nm_version}
BuildRequires: NetworkManager-glib-devel >= %{nm_version}
%endif
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
BuildRequires: libsecret-devel
%if %{with libnma_gtk4}
BuildRequires: gtk4-devel >= 3.96
%endif
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: /usr/bin/autopoint
@ -58,6 +58,8 @@ BuildRequires: jansson-devel
BuildRequires: gcr-devel
BuildRequires: libselinux-devel
BuildRequires: mobile-broadband-provider-info-devel
BuildRequires: libappindicator-gtk3-devel
BuildRequires: libdbusmenu-gtk3-devel
%description
This package contains a network control and status notification area applet
@ -65,82 +67,22 @@ for use with NetworkManager.
%package -n nm-connection-editor
Summary: A network connection configuration editor for NetworkManager
Requires: libnma%{?_isa} >= %{libnma_version}
%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 NetworkManager GUI support
Group: Development/Libraries
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < %{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.
%package -n libnm-gtk-devel
Summary: Private header files for NetworkManager GUI support
Group: Development/Libraries
Requires: NetworkManager-devel >= %{nm_version}
Requires: NetworkManager-glib-devel >= %{nm_version}
Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver}
Requires: libnm-gtk = %{version}-%{release}
Requires: gtk3-devel
Requires: pkgconfig
%description -n libnm-gtk-devel
This package contains private header and pkg-config files to be used only by
GNOME control center.
This package is obsoleted by libnma.
%package -n libnma
Summary: Private libraries for NetworkManager GUI support
Group: Development/Libraries
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < %{obsoletes_ver}
%description -n libnma
This package contains private libraries to be used only by nm-applet,
nm-connection editor, and the GNOME Control Center.
%package -n libnma-devel
Summary: Private header files for NetworkManager GUI support
Group: Development/Libraries
Requires: NetworkManager-libnm-devel >= %{nm_version}
Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver}
Requires: libnma = %{version}-%{release}
Requires: gtk3-devel
Requires: pkgconfig
%description -n libnma-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.
This package deprecates libnm-gtk.
%prep
%setup -q -n "%{name}-%{real_version}"
%patch1 -p1
%patch2 -p1
%patch3 -p1
%autosetup -p1 -n "%{name}-%{real_version}"
%build
%meson \
-Dgcr=true \
-Dselinux=true \
-Ddisable-static=true \
%if %{with libnm_gtk}
-Dlibnm_gtk=true
%else
-Dlibnm_gtk=false
%endif
-Dappindicator=yes
%meson_build
%install
@ -157,11 +99,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%check
%meson_test
%post -n libnma -p /sbin/ldconfig
%postun -n libnma -p /sbin/ldconfig
%post -n libnm-gtk -p /sbin/ldconfig
%postun -n libnm-gtk -p /sbin/ldconfig
%files
%{_bindir}/nm-applet
@ -193,35 +130,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_mandir}/man1/nm-connection-editor*
%dir %{_datadir}/gnome-vpn-properties
%if %{with libnm_gtk}
%files -n libnm-gtk
%{_libdir}/libnm-gtk.so.*
%{_libdir}/girepository-1.0/NMGtk-1.0.typelib
%endif
%if %{with libnm_gtk}
%files -n libnm-gtk-devel
%dir %{_includedir}/libnm-gtk
%{_includedir}/libnm-gtk/*.h
%{_libdir}/pkgconfig/libnm-gtk.pc
%{_libdir}/libnm-gtk.so
%{_datadir}/gir-1.0/NMGtk-1.0.gir
%endif
%files -n libnma
%{_libdir}/libnma.so.*
%{_libdir}/girepository-1.0/NMA-1.0.typelib
%files -n libnma-devel
%dir %{_includedir}/libnma
%{_includedir}/libnma/*.h
%{_libdir}/pkgconfig/libnma.pc
%{_libdir}/libnma.so
%{_datadir}/gir-1.0/NMA-1.0.gir
%{_datadir}/gtk-doc
%changelog
* Mon Jun 22 2020 Beniamino Galvani <bgalvani@redhat.com> - 1.18.0-1
- Update to 1.18.0 release (rh #1814748)
* Mon May 18 2020 Beniamino Galvani <bgalvani@redhat.com> - 1.8.22-3
- Drop gschema XML which conflicts with new libnma package