|
|
|
@ -5,12 +5,6 @@
|
|
|
|
%global libnma_version 1.8.27
|
|
|
|
%global libnma_version 1.8.27
|
|
|
|
%global obsoletes_ver 1:0.9.7
|
|
|
|
%global obsoletes_ver 1:0.9.7
|
|
|
|
|
|
|
|
|
|
|
|
%global rpm_version 1.26.0
|
|
|
|
|
|
|
|
%global real_version 1.26.0
|
|
|
|
|
|
|
|
%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')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if 0%{?fedora} > 31 || 0%{?rhel} > 8
|
|
|
|
%if 0%{?fedora} > 31 || 0%{?rhel} > 8
|
|
|
|
%bcond_with libnma_gtk4
|
|
|
|
%bcond_with libnma_gtk4
|
|
|
|
%else
|
|
|
|
%else
|
|
|
|
@ -25,18 +19,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
Name: network-manager-applet
|
|
|
|
Name: network-manager-applet
|
|
|
|
Summary: A network control and status applet for NetworkManager
|
|
|
|
Summary: A network control and status applet for NetworkManager
|
|
|
|
Version: %{rpm_version}
|
|
|
|
Version: 1.36.0
|
|
|
|
Release: %{release_version}%{?dist}
|
|
|
|
Release: 4%{?dist}
|
|
|
|
License: GPLv2+
|
|
|
|
License: GPL-2.0-or-later
|
|
|
|
URL: http://www.gnome.org/projects/NetworkManager/
|
|
|
|
URL: http://www.gnome.org/projects/NetworkManager/
|
|
|
|
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
|
|
|
|
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
|
|
|
|
|
|
|
|
|
|
|
|
Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
|
|
|
|
Source: https://download.gnome.org/sources/network-manager-applet/1.36/%{name}-%{version}.tar.xz
|
|
|
|
# Patch1: 0001-sample-name.patch
|
|
|
|
Patch1: 0001-nm-applet-no-notifications.patch
|
|
|
|
Patch1: 0001-po-ja-update-Japanese-translation.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Requires: NetworkManager >= %{nm_version}
|
|
|
|
Requires: NetworkManager >= %{nm_version}
|
|
|
|
Requires: libnotify >= 0.4.3
|
|
|
|
|
|
|
|
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
|
|
|
|
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
|
|
|
|
Requires: libnma%{?_isa} >= %{libnma_version}
|
|
|
|
Requires: libnma%{?_isa} >= %{libnma_version}
|
|
|
|
|
|
|
|
|
|
|
|
@ -52,13 +44,11 @@ BuildRequires: gobject-introspection-devel >= 0.10.3
|
|
|
|
BuildRequires: gettext-devel
|
|
|
|
BuildRequires: gettext-devel
|
|
|
|
BuildRequires: /usr/bin/autopoint
|
|
|
|
BuildRequires: /usr/bin/autopoint
|
|
|
|
BuildRequires: pkgconfig
|
|
|
|
BuildRequires: pkgconfig
|
|
|
|
BuildRequires: libnotify-devel >= 0.4
|
|
|
|
|
|
|
|
BuildRequires: meson
|
|
|
|
BuildRequires: meson
|
|
|
|
BuildRequires: intltool
|
|
|
|
BuildRequires: intltool
|
|
|
|
BuildRequires: gtk-doc
|
|
|
|
BuildRequires: gtk-doc
|
|
|
|
BuildRequires: desktop-file-utils
|
|
|
|
BuildRequires: desktop-file-utils
|
|
|
|
BuildRequires: iso-codes-devel
|
|
|
|
BuildRequires: iso-codes-devel
|
|
|
|
BuildRequires: libgudev1-devel >= 147
|
|
|
|
|
|
|
|
BuildRequires: libsecret-devel >= 0.12
|
|
|
|
BuildRequires: libsecret-devel >= 0.12
|
|
|
|
BuildRequires: jansson-devel
|
|
|
|
BuildRequires: jansson-devel
|
|
|
|
BuildRequires: gcr-devel
|
|
|
|
BuildRequires: gcr-devel
|
|
|
|
@ -95,13 +85,13 @@ environment.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
%prep
|
|
|
|
%autosetup -p1 -n "%{name}-%{real_version}"
|
|
|
|
%autosetup -p1
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
%build
|
|
|
|
%meson \
|
|
|
|
%meson \
|
|
|
|
-Dselinux=true \
|
|
|
|
-Dselinux=true \
|
|
|
|
%if %{with appindicator}
|
|
|
|
%if %{with appindicator}
|
|
|
|
-Dappindicator=yes
|
|
|
|
-Dappindicator=auto
|
|
|
|
%else
|
|
|
|
%else
|
|
|
|
-Dappindicator=no
|
|
|
|
-Dappindicator=no
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
@ -110,22 +100,35 @@ environment.
|
|
|
|
%install
|
|
|
|
%install
|
|
|
|
%meson_install
|
|
|
|
%meson_install
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
|
|
|
|
|
|
|
|
%if 0%{?rhel} >= 10
|
|
|
|
|
|
|
|
rm $RPM_BUILD_ROOT%{_bindir}/nm-applet
|
|
|
|
|
|
|
|
rm $RPM_BUILD_ROOT%{_datadir}/applications/nm-applet.desktop
|
|
|
|
|
|
|
|
rm $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
|
|
|
|
|
|
|
rm $RPM_BUILD_ROOT%{_mandir}/man1/nm-applet*
|
|
|
|
|
|
|
|
rm $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/nm-applet.mo
|
|
|
|
|
|
|
|
%else
|
|
|
|
%find_lang nm-applet
|
|
|
|
%find_lang nm-applet
|
|
|
|
cat nm-applet.lang >> %{name}.lang
|
|
|
|
cat nm-applet.lang >> %{name}.lang
|
|
|
|
|
|
|
|
%endif
|
|
|
|
# validate .desktop and autostart files
|
|
|
|
# validate .desktop and autostart files
|
|
|
|
|
|
|
|
%if 0%{?rhel} >= 10
|
|
|
|
|
|
|
|
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop
|
|
|
|
|
|
|
|
%else
|
|
|
|
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
|
|
|
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
|
|
|
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop
|
|
|
|
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
%check
|
|
|
|
%meson_test
|
|
|
|
%meson_test
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
%files
|
|
|
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} < 10
|
|
|
|
%{_bindir}/nm-applet
|
|
|
|
%{_bindir}/nm-applet
|
|
|
|
%{_datadir}/applications/nm-applet.desktop
|
|
|
|
%{_datadir}/applications/nm-applet.desktop
|
|
|
|
|
|
|
|
%endif
|
|
|
|
%{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.png
|
|
|
|
%{_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-mb-roam.png
|
|
|
|
%{_datadir}/icons/hicolor/22x22/apps/nm-secure-lock.png
|
|
|
|
%{_datadir}/icons/hicolor/22x22/apps/nm-secure-lock.png
|
|
|
|
%{_datadir}/icons/hicolor/22x22/apps/nm-signal-*.png
|
|
|
|
%{_datadir}/icons/hicolor/22x22/apps/nm-signal-*.png
|
|
|
|
@ -135,23 +138,27 @@ 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-vpn-connecting*.png
|
|
|
|
%{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
|
|
|
|
%{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
|
|
|
|
%{_datadir}/icons/hicolor/scalable/apps/*.svg
|
|
|
|
%{_datadir}/icons/hicolor/scalable/apps/*.svg
|
|
|
|
%{_datadir}/icons/hicolor/22x22/apps/nm-insecure-warn.png
|
|
|
|
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
|
|
|
|
%{_datadir}/GConf/gsettings/nm-applet.convert
|
|
|
|
%{_datadir}/GConf/gsettings/nm-applet.convert
|
|
|
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} < 10
|
|
|
|
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
|
|
|
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
|
|
|
%{_mandir}/man1/nm-applet*
|
|
|
|
%{_mandir}/man1/nm-applet*
|
|
|
|
|
|
|
|
%endif
|
|
|
|
%doc NEWS CONTRIBUTING
|
|
|
|
%doc NEWS CONTRIBUTING
|
|
|
|
%license COPYING
|
|
|
|
%license COPYING
|
|
|
|
|
|
|
|
|
|
|
|
# Yes, lang files for the applet go in nm-connection-editor RPM since it
|
|
|
|
# Yes, lang files for the applet go in nm-connection-editor RPM since it
|
|
|
|
# is the RPM that everything else depends on
|
|
|
|
# is the RPM that everything else depends on
|
|
|
|
%files -n nm-connection-editor -f %{name}.lang
|
|
|
|
%files -n nm-connection-editor
|
|
|
|
%{_bindir}/nm-connection-editor
|
|
|
|
%{_bindir}/nm-connection-editor
|
|
|
|
%{_datadir}/icons/hicolor/*/apps/nm-device-*.*
|
|
|
|
%{_datadir}/icons/hicolor/*/apps/nm-device-*.*
|
|
|
|
%{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
|
|
|
|
%{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
|
|
|
|
%{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
|
|
|
|
%{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
|
|
|
|
%{_mandir}/man1/nm-connection-editor*
|
|
|
|
%{_mandir}/man1/nm-connection-editor*
|
|
|
|
%dir %{_datadir}/gnome-vpn-properties
|
|
|
|
%dir %{_datadir}/gnome-vpn-properties
|
|
|
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} < 10
|
|
|
|
|
|
|
|
%{name}.lang
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%files -n nm-connection-editor-desktop
|
|
|
|
%files -n nm-connection-editor-desktop
|
|
|
|
%{_datadir}/applications/nm-connection-editor.desktop
|
|
|
|
%{_datadir}/applications/nm-connection-editor.desktop
|
|
|
|
@ -159,32 +166,68 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
* Fri Oct 07 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.26.0-2
|
|
|
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.36.0-4
|
|
|
|
- Update Japanese translation (rh #2083047)
|
|
|
|
- Bump release for October 2024 mass rebuild:
|
|
|
|
|
|
|
|
Resolves: RHEL-64018
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Mar 22 2022 Ana Cabral <acabral@redhat.com> - 1.26.0-1
|
|
|
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.36.0-3
|
|
|
|
- Update to 1.26.0 release (rh #2066750)
|
|
|
|
- Bump release for June 2024 mass rebuild
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Feb 22 2022 Ana Cabral <acabral@redhat.com> - 1.24.0-2
|
|
|
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.0-2
|
|
|
|
- Fix OWE settings disappearing on nm-connection-editor (rh #2057004)
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Aug 17 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.24.0-1
|
|
|
|
* Fri Jan 19 2024 Íñigo Huguet <ihuguet@redhat.com> - 1.36.0-1
|
|
|
|
- Update to 1.24.0 release
|
|
|
|
- Update to 1.36.0 release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Nov 2 2023 Íñigo Huguet <ihuguet@redhat.com> - 1.34.0-2
|
|
|
|
|
|
|
|
- migrate to SPDX license
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Oct 16 2023 Beniamino Galvani <bgalvani@redhat.com> - 1.34.0-1
|
|
|
|
|
|
|
|
- Update to 1.34.0 release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.32.0-2
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Sun Apr 16 2023 Lubomir Rintel <lkundrak@v3.sk> - 1.32.0-1
|
|
|
|
|
|
|
|
- Update to 1.32.0 release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Feb 17 2023 Lubomir Rintel <lkundrak@v3.sk> - 1.30.0-3
|
|
|
|
|
|
|
|
- applet: use appindicator if we can outside of X11
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.30.0-2
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.22.0-1.2
|
|
|
|
* Mon Nov 07 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.30.0-1
|
|
|
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
|
|
- Update to 1.30.0 release
|
|
|
|
Related: rhbz#1991688
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.0-2
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Jun 07 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.28.0-1
|
|
|
|
|
|
|
|
- Update to 1.28.0 release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri May 13 2022 Thomas Haller <thaller@redhat.com> - 1.26.0-2
|
|
|
|
|
|
|
|
- Rebuild and spec file cleanup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Mar 29 2022 Ana Cabral <acabral@redhat.com> - 1.26.0-1.1
|
|
|
|
|
|
|
|
- Update to 1.26.0 release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.0-1.1
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Aug 19 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.24.0-1.1
|
|
|
|
|
|
|
|
- Update to 1.24.0 release
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Jul 5 2021 Wen Liang <wenliang@redhat.com> - 1.22.0-1
|
|
|
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-1.1
|
|
|
|
- Update to 1.22.0 release.
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
- editor: show missing toggle in the 8021x-security page.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.20.0-4.1
|
|
|
|
* Mon May 10 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.22.0-1
|
|
|
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
|
|
- Update to 1.22.0 release
|
|
|
|
|
|
|
|
- editor: fix crash evaluating secondary connections (rh #1942905)
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Feb 3 2021 Thomas Haller <thaller@redhat.com> - 1.20.0-1
|
|
|
|
* Wed Feb 3 2021 Thomas Haller <thaller@redhat.com> - 1.20.0-4
|
|
|
|
- Update to 1.20.0 release
|
|
|
|
- Update to 1.20.0 release
|
|
|
|
- Drop NotShowIn=GNOME
|
|
|
|
- editor: drop NotShowIn=GNOME
|
|
|
|
- Use wireless-security code from libnma
|
|
|
|
- Use wireless-security code from libnma
|
|
|
|
- Add flatpak build configuration
|
|
|
|
- Add flatpak build configuration
|
|
|
|
- applet: hide unmanaged ethernet devices in nm-applet
|
|
|
|
- applet: hide unmanaged ethernet devices in nm-applet
|
|
|
|
|
