From a5ecd7ccb53d9e34c471a687400557264bf723f8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 May 2022 08:44:03 +0200 Subject: [PATCH] Rebuild and spec file cleanup Not very useful change. Only done, because the update should also go to F36, and the current version number has this odd suffix in 1.26.0-1.1. --- network-manager-applet.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/network-manager-applet.spec b/network-manager-applet.spec index 57d80ea..3d68719 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -5,9 +5,9 @@ %global libnma_version 1.8.27 %global obsoletes_ver 1:0.9.7 -%global rpm_version 1.26.0 %global real_version 1.26.0 -%global release_version 1 +%global rpm_version %{real_version} +%global release_version 2 %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') @@ -26,7 +26,7 @@ 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} @@ -99,7 +99,7 @@ environment. %meson \ -Dselinux=true \ %if %{with appindicator} - -Dappindicator=yes + -Dappindicator=auto %else -Dappindicator=no %endif @@ -124,6 +124,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_bindir}/nm-applet %{_datadir}/applications/nm-applet.desktop %{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.png +%{_datadir}/icons/hicolor/22x22/apps/nm-insecure-warn.png %{_datadir}/icons/hicolor/22x22/apps/nm-mb-roam.png %{_datadir}/icons/hicolor/22x22/apps/nm-secure-lock.png %{_datadir}/icons/hicolor/22x22/apps/nm-signal-*.png @@ -133,7 +134,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png %{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png %{_datadir}/icons/hicolor/scalable/apps/*.svg -%{_datadir}/icons/hicolor/22x22/apps/nm-insecure-warn.png %{_datadir}/GConf/gsettings/nm-applet.convert %{_sysconfdir}/xdg/autostart/nm-applet.desktop %{_mandir}/man1/nm-applet* @@ -157,7 +157,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %changelog -* Tue Mar 29 2022 Ana Cabral - 1.26.0-1 +* Fri May 13 2022 Thomas Haller - 1.26.0-2 +- Rebuild and spec file cleanup + +* Tue Mar 29 2022 Ana Cabral - 1.26.0-1.1 - Update to 1.26.0 release * Thu Jan 20 2022 Fedora Release Engineering - 1.24.0-1.1