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

update to 1.16.0 release

Browse Source 
Drop "0001-nm-applet-no-notifications.patch". "org.gnome.nm-applet.gschema.xml"
is now part of libnma package. The patch moved there.
This commit is contained in:
Thomas Haller 2020-03-05 11:27:40 +01:00
parent e4b7bd51a0
commit 355d5a645e
6 changed files with 16 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -47,3 +47,4 @@
/network-manager-applet-1.8.20.tar.xz
/network-manager-applet-1.8.22.tar.xz
/network-manager-applet-1.8.24.tar.xz
/network-manager-applet-1.16.0.tar.xz

28
0001-appdata-add-OARS-rating.patch
View File

@ -1,28 +0,0 @@
From 397dc79e58ab50ca2ca3d49bc600eb05028f3927 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Wed, 9 Oct 2019 16:26:51 +0200
Subject: [PATCH 1/2] appdata: add OARS rating
There's no content that would be ranked objectionable by OARS unless you're
the sort of person that likes to put nudity, religious violence and
adultery into your connections. That's none of our business though.
The new version of appdata-util insists on this tag being around.
---
nm-connection-editor.appdata.xml.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/nm-connection-editor.appdata.xml.in b/nm-connection-editor.appdata.xml.in
index 6d30bf14..5f06de01 100644
--- a/nm-connection-editor.appdata.xml.in
+++ b/nm-connection-editor.appdata.xml.in
@@ -25,4 +25,6 @@
<update_contact>networkmanager-maint@gnome.bugs</update_contact>
<translation type="gettext">nm-applet</translation>
<developer_name>The NetworkManager Developers</developer_name>
+
+ <content_rating type="oars-1.0" />
</component>
--
2.23.0

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>

78
0002-appdata-add-release-tag.patch
View File

@ -1,78 +0,0 @@
From 149b0c204c6550a628e0ae76cc027ad760c55c54 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Wed, 9 Oct 2019 16:36:46 +0200
Subject: [PATCH 2/2] appdata: add release tag
The description is not filled in. We can't merge this with the NEWS file
because this pertains only to the editor.
There's no machinery to automatically check this yet. Just the bare
minimum to keep the new version of appdata-util happy.
---
nm-connection-editor.appdata.xml.in | 52 +++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/nm-connection-editor.appdata.xml.in b/nm-connection-editor.appdata.xml.in
index 5f06de01..4f49ee24 100644
--- a/nm-connection-editor.appdata.xml.in
+++ b/nm-connection-editor.appdata.xml.in
@@ -27,4 +27,56 @@
<developer_name>The NetworkManager Developers</developer_name>
<content_rating type="oars-1.0" />
+
+ <releases>
+ <release version="1.8.24" date="2019-10-09" />
+ <release version="1.8.22" date="2019-05-29" />
+ <release version="1.8.20" date="2019-02-07" />
+ <release version="1.8.18" date="2018-09-07" />
+ <release version="1.8.16" date="2018-08-07" />
+ <release version="1.8.14" date="2018-06-25" />
+ <release version="1.8.12" date="2018-05-28" />
+ <release version="1.8.10" date="2017-12-19" />
+ <release version="1.8.8" date="2017-12-18" />
+ <release version="1.8.6" date="2017-11-07" />
+ <release version="1.8.4" date="2017-09-20" />
+ <release version="1.8.2" date="2017-06-13" />
+ <release version="1.8.0" date="2017-05-10" />
+ <release version="1.4.6" date="2017-03-06" />
+ <release version="1.4.4" date="2017-01-25" />
+ <release version="1.4.2" date="2016-09-30" />
+ <release version="1.4.0" date="2016-08-24" />
+ <release version="1.2.4" date="2016-08-03" />
+ <release version="1.2.2" date="2016-05-11" />
+ <release version="1.2.0" date="2016-04-20" />
+ <release version="1.0.10" date="2015-12-23" />
+ <release version="1.0.8" date="2015-11-20" />
+ <release version="1.0.6" date="2015-08-27" />
+ <release version="1.0.4" date="2015-07-14" />
+ <release version="1.0.2" date="2015-05-05" />
+ <release version="1.0.0" date="2014-12-18" />
+ <release version="0.9.10" date="2014-07-03" />
+ <release version="0.9.8.10" date="2014-04-24" />
+ <release version="0.9.8.9" date="2014-04-02" />
+ <release version="0.9.8.8" date="2013-11-11" />
+ <release version="0.9.8.4" date="2013-09-13" />
+ <release version="0.9.8.2" date="2013-06-07" />
+ <release version="0.9.8.0" date="2013-02-20" />
+ <release version="0.9.6.4" date="2012-10-26" />
+ <release version="0.9.6.2" date="2012-08-09" />
+ <release version="0.9.6.0" date="2012-08-07" />
+ <release version="0.9.4.1" date="2012-03-23" />
+ <release version="0.9.4.0" date="2012-03-23" />
+ <release version="0.9.2" date="2011-11-09" />
+ <release version="0.9.0" date="2011-08-22" />
+ <release version="0.8.4" date="2011-04-20" />
+ <release version="0.8.2" date="2010-11-03" />
+ <release version="0.8.1" date="2010-07-21" />
+ <release version="0.8" date="2010-02-18" />
+ <release version="0.7.2" date="2009-11-23" />
+ <release version="0.7.1" date="2009-04-13" />
+ <release version="0.7.0" date="2008-11-27" />
+ <release version="0.6.6" date="2008-03-06" />
+ <release version="0.6.5" date="2007-04-11" />
+ </releases>
</component>
--
2.23.0

167
network-manager-applet.spec
View File

@ -1,21 +1,16 @@
%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.8.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.24
%global real_version 1.8.24
%global rpm_version 1.16.0
%global real_version 1.16.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
%else
%bcond_without libnm_gtk
%endif
%if 0%{?fedora} > 31 || 0%{?rhel} > 8
%bcond_with libnma_gtk4
%else
@ -25,28 +20,20 @@
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: %{rpm_version}
Release: %{release_version}%{?dist}.1
Release: %{release_version}%{?dist}
License: GPLv2+
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
# https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/67
Patch2: 0001-appdata-add-OARS-rating.patch
Patch3: 0002-appdata-add-release-tag.patch
Requires: NetworkManager >= %{nm_version}
Requires: libnotify >= 0.4.3
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
Requires: libnma%{?_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 >= %{libnma_version}
BuildRequires: ModemManager-glib-devel >= 1.0
BuildRequires: glib2-devel >= 2.32
BuildRequires: gtk3-devel >= 3.10
@ -76,85 +63,13 @@ for use with NetworkManager.
%package -n nm-connection-editor
Summary: A network connection configuration editor for NetworkManager
Requires: libnma%{?_isa} = %{version}-%{release}
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: Legacy NetworkManager GUI library
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < %{obsoletes_ver}
%description -n libnm-gtk
This package contains the legacy version of library used for integrating GUI
tools with NetworkManager.
%package -n libnm-gtk-devel
Summary: Header files for legacy NetworkManager GUI library
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 legacy version of header and pkg-config files to be
used for integrating GUI tools with NetworkManager.
%package -n libnma
Summary: NetworkManager GUI library
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < %{obsoletes_ver}
%description -n libnma
This package contains the library used for integrating GUI tools with
NetworkManager.
%package -n libnma-devel
Summary: Header files for NetworkManager GUI library
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 header and pkg-config files to be used for integrating
GUI tools with NetworkManager.
%package -n libnma-gtk4
Summary: Experimental GTK 4 version of NetworkManager GUI library
Requires: gtk4 >= %{gtk4_version}
Requires: mobile-broadband-provider-info >= 0.20090602
%description -n libnma-gtk4
This package contains the experimental GTK4 version of library used for
integrating GUI tools with NetworkManager.
%package -n libnma-gtk4-devel
Summary: Header files for exerimental GTK4 version of NetworkManager GUI library
Requires: NetworkManager-libnm-devel >= %{nm_version}
Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver}
Requires: libnma = %{version}-%{release}
Requires: gtk3-devel
Requires: pkgconfig
%description -n libnma-gtk4-devel
This package contains the experimental GTK4 version of header and pkg-config
files to be used for integrating GUI tools with NetworkManager.
%prep
%autosetup -p1 -n "%{name}-%{real_version}"
@ -162,17 +77,7 @@ files to be used for integrating GUI tools with NetworkManager.
%meson \
-Dgcr=true \
-Dselinux=true \
-Ddisable-static=true \
%if %{with libnma_gtk4}
-Dlibnma_gtk4=true \
%else
-Dlibnma_gtk4=false \
%endif
%if %{with libnm_gtk}
-Dlibnm_gtk=true
%else
-Dlibnm_gtk=false
%endif
-Ddisable-static=true
%meson_build
%install
@ -189,12 +94,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%check
%meson_test
%ldconfig_scriptlets -n libnma
%ldconfig_scriptlets -n libnm-gtk
%ldconfig_scriptlets -n libnma-gtk4
%files
%{_bindir}/nm-applet
@ -222,55 +121,17 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_datadir}/icons/hicolor/*/apps/nm-device-*.*
%{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
%{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
%{_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
%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
%{_includedir}/libnma
%{_libdir}/pkgconfig/libnma.pc
%{_libdir}/libnma.so
%{_datadir}/gir-1.0/NMA-1.0.gir
%{_datadir}/gtk-doc
%if %{with libnma_gtk4}
%files -n libnma-gtk4
%{_libdir}/libnma-gtk4.so.*
%{_libdir}/girepository-1.0/NMA4-1.0.typelib
%files -n libnma-gtk4-devel
%{_includedir}/libnma
%{_libdir}/pkgconfig/libnma-gtk4.pc
%{_libdir}/libnma-gtk4.so
%{_datadir}/gir-1.0/NMA4-1.0.gir
%endif
%changelog
* Sat Mar 7 2020 Thomas Haller <thaller@redhat.com> - 1.16.0-1
- Update to 1.16.0 release
- Move libnma to separate, independent project
- move org.gnome.nm-applet.gschema.xml to libnma
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.24-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (network-manager-applet-1.8.24.tar.xz) = 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
SHA512 (network-manager-applet-1.16.0.tar.xz) = 0ad8ac1d05cf76b9a82602c6f8f7034ae52fc11bae0b5ee17cf5bd89c6c91ba3ef7b07f770397b22484d54fd69e7a9a73f8c08a4d3d9f492f11d09d0b0379ff5