diff --git a/network-manager-applet.spec b/network-manager-applet.spec index e8c8964..0bb72f0 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -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 - 1.18.0-4 +- Move desktop file to new nm-connection-editor-desktop package (rh #1923262) + * Tue Jan 26 2021 Fedora Release Engineering - 1.18.0-3.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild