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

Move desktop file to new nm-connection-editor-desktop package (rh #1923262)

Browse Source 
Historically, nm-connection-editor had NotShowIn=GNOME because
on the one hand gnome-control-center depended on nm-c-e (so it
was always installed), on the other hand, it is deemed confusing
to have two network configuration tools.

Not being able to start nm-connection-editor is also undesirable,
so after long back and forth, this was (again) changed upstream with
([1]). Also, in the meantime gnome-control-center should no longer
depend on nm-c-e, so it seems all good. Almost.

However, gnome-control-center *still* Recomments: on nm-c-e ([2])
and also with Fedora live installation, nm-c-e ends up installed
in the final system (because nm-c-e is a dependency of anaconda, and
with live installation those dependencies also get installed ([3]).
Regardless of these two problems, the WG also does not like that
an existing Fedora installation (which likely has nm-c-e installed),
after upgrade has nm-c-e showing up and confusing users.

So, the agreed plan is to move the desktop file out of
nm-connection-editor and ship it with a new nm-connection-editor-desktop
package. Note that this is not a regular package split (with
Obsoletes:), because we in fact want during package update to get
rid of nm-c-e's desktop file. Of course, this breaks non GNOME spins,
which actually expected that nm-connection-editor is startable in the DE.

[1] 297610d0c5
[2] https://bugzilla.redhat.com/show_bug.cgi?id=1887891#c6
[3] https://bugzilla.redhat.com/show_bug.cgi?id=1919312
This commit is contained in:
Thomas Haller 2021-02-02 18:28:53 +01:00
parent ebcde84a78
commit d2410a2faf
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
network-manager-applet.spec
View File

@ -7,7 +7,7 @@
%global rpm_version 1.18.0
%global real_version 1.18.0
%global release_version 3
%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}"
@ -134,16 +144,22 @@ 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
* 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