Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/network-manager-applet.git#0e0e4de76802333a88be34129f2793688096bf07
This commit is contained in:
parent
820e383202
commit
fc603ecc50
1
.gitignore
vendored
1
.gitignore
vendored
@ -49,3 +49,4 @@
|
||||
/network-manager-applet-1.8.24.tar.xz
|
||||
/network-manager-applet-1.16.0.tar.xz
|
||||
/network-manager-applet-1.18.0.tar.xz
|
||||
/network-manager-applet-1.20.0.tar.xz
|
||||
|
@ -5,9 +5,9 @@
|
||||
%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 3
|
||||
%global rpm_version 1.20.0
|
||||
%global real_version 1.20.0
|
||||
%global release_version 4
|
||||
|
||||
%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}.2
|
||||
Release: %{release_version}%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://www.gnome.org/projects/NetworkManager/
|
||||
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
|
||||
@ -82,6 +82,16 @@ This package contains a network configuration editor and Bluetooth modem
|
||||
utility for use with NetworkManager.
|
||||
|
||||
|
||||
%package -n nm-connection-editor-desktop
|
||||
Summary: The desktop file for nm-connection-editor
|
||||
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n nm-connection-editor-desktop
|
||||
This package contains the desktop file and appdata for nm-connection-editor.
|
||||
Without it, the nm-connection-editor cannot be started from the desktop
|
||||
environment.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n "%{name}-%{real_version}"
|
||||
|
||||
@ -124,6 +134,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
|
||||
%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-active-lock.png
|
||||
%{_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}/GConf/gsettings/nm-applet.convert
|
||||
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
||||
%{_mandir}/man1/nm-applet*
|
||||
@ -134,16 +145,31 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
|
||||
# is the RPM that everything else depends on
|
||||
%files -n nm-connection-editor -f %{name}.lang
|
||||
%{_bindir}/nm-connection-editor
|
||||
%{_datadir}/applications/nm-connection-editor.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/nm-device-*.*
|
||||
%{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
|
||||
%{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
|
||||
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
|
||||
%{_mandir}/man1/nm-connection-editor*
|
||||
%dir %{_datadir}/gnome-vpn-properties
|
||||
|
||||
|
||||
%files -n nm-connection-editor-desktop
|
||||
%{_datadir}/applications/nm-connection-editor.desktop
|
||||
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Feb 3 2021 Thomas Haller <thaller@redhat.com> - 1.20.0-1
|
||||
- Update to 1.20.0 release
|
||||
- Drop NotShowIn=GNOME
|
||||
- Use wireless-security code from libnma
|
||||
- Add flatpak build configuration
|
||||
- applet: hide unmanaged ethernet devices in nm-applet
|
||||
- applet: fix Wi-Fi scan requests with appindicator
|
||||
- editor: fix drop down list for connection.secondaries
|
||||
|
||||
* Tue Feb 2 2021 Thomas Haller <thaller@redhat.com> - 1.18.0-4
|
||||
- Move desktop file to new nm-connection-editor-desktop package (rh #1923262)
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (network-manager-applet-1.18.0.tar.xz) = adca7c723600ec1cb2eed0110e369cf707fde1d64a81489440a167516d178a501fe883c08db06371b8aac896188eb2037a7577ecca721d764be33f4025a386d4
|
||||
SHA512 (network-manager-applet-1.20.0.tar.xz) = 3b7ffd61e4f810fedee5aaf64725fcc2a8ee3c6b776f2d0b93f337c207516392b4720acea35c56c80755842c600edb971a67813c1583c112a91496d3d8db2c67
|
||||
|
Loading…
Reference in New Issue
Block a user