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

import network-manager-applet-1.18.0-1.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-07-28 08:48:21 -04:00 committed by Stepan Oksanichenko
parent 8dd9b74696
commit d768bc137b
5 changed files with 29 additions and 3357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/network-manager-applet-1.8.22.tar.xz
SOURCES/network-manager-applet-1.18.0.tar.xz

2
.network-manager-applet.metadata
View File

@ -1 +1 @@
052e371469ed3840a9b9015001e3bc2873c5a962 SOURCES/network-manager-applet-1.8.22.tar.xz
6d79ca3373212df29e20fbcc49a6ab33d01c3120 SOURCES/network-manager-applet-1.18.0.tar.xz

13
SOURCES/0001-nm-applet-no-notifications.patch
View File

@ -1,13 +0,0 @@
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index 9e2887e..4f8c16a 100644
--- a/org.gnome.nm-applet.gschema.xml.in
+++ b/org.gnome.nm-applet.gschema.xml.in
@@ -17,7 +17,7 @@
<description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</description>
</key>
<key name="suppress-wireless-networks-available" type="b">
- <default>false</default>
+ <default>true</default>
<summary>Suppress networks available notifications</summary>
<description>Set this to true to disable notifications when Wi-Fi networks are available.</description>
</key>

3232
SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch
View File

File diff suppressed because it is too large Load Diff

137
SPECS/network-manager-applet.spec
View File

@ -1,18 +1,20 @@
%global gtk3_version %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad)
%global gtk4_version %(pkg-config --modversion gtk4 2>/dev/null || echo bad)
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global nm_version 1:1.1.0
%global nm_version 1:1.16.0
%global libnma_version 1.8.27
%global obsoletes_ver 1:0.9.7
%global rpm_version 1.8.22
%global real_version 1.8.22
%global release_version 2
%global rpm_version 1.18.0
%global real_version 1.18.0
%global release_version 1
%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} > 28 || 0%{?rhel} > 7
%bcond_with libnm_gtk
%if 0%{?fedora} > 31 || 0%{?rhel} > 7
%bcond_with libnma_gtk4
%else
%bcond_without libnm_gtk
%bcond_without libnma_gtk4
%endif
Name: network-manager-applet
@ -25,22 +27,21 @@ URL: http://www.gnome.org/projects/NetworkManager/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
Patch1: 0001-nm-applet-no-notifications.patch
Patch2: 0001-po-RHEL-8.1-translations-rh1690001.patch
#Patch1: 0001-some.patch
Requires: NetworkManager >= %{nm_version}
Requires: libnotify >= 0.4.3
Requires: nm-connection-editor = %{version}-%{release}
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
Requires: libnma%{?_isa} >= %{libnma_version}
%if %{with libnm_gtk}
BuildRequires: NetworkManager-devel >= %{nm_version}
BuildRequires: NetworkManager-glib-devel >= %{nm_version}
%endif
BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
BuildRequires: libnma-devel >= %{libnma_version}
BuildRequires: ModemManager-glib-devel >= 1.0
BuildRequires: glib2-devel >= 2.32
BuildRequires: gtk3-devel >= 3.10
BuildRequires: libsecret-devel
%if %{with libnma_gtk4}
BuildRequires: gtk4-devel >= 3.96
%endif
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: /usr/bin/autopoint
@ -57,6 +58,8 @@ BuildRequires: jansson-devel
BuildRequires: gcr-devel
BuildRequires: libselinux-devel
BuildRequires: mobile-broadband-provider-info-devel
BuildRequires: libappindicator-gtk3-devel
BuildRequires: libdbusmenu-gtk3-devel
%description
This package contains a network control and status notification area applet
@ -64,81 +67,22 @@ for use with NetworkManager.
%package -n nm-connection-editor
Summary: A network connection configuration editor for NetworkManager
Requires: libnma%{?_isa} >= %{libnma_version}
%description -n nm-connection-editor
This package contains a network configuration editor and Bluetooth modem
utility for use with NetworkManager.
%package -n libnm-gtk
Summary: Private libraries for NetworkManager GUI support
Group: Development/Libraries
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < %{obsoletes_ver}
%description -n libnm-gtk
This package contains private libraries to be used only by nm-applet,
nm-connection editor, and the GNOME Control Center.
%package -n libnm-gtk-devel
Summary: Private header files for NetworkManager GUI support
Group: Development/Libraries
Requires: NetworkManager-devel >= %{nm_version}
Requires: NetworkManager-glib-devel >= %{nm_version}
Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver}
Requires: libnm-gtk = %{version}-%{release}
Requires: gtk3-devel
Requires: pkgconfig
%description -n libnm-gtk-devel
This package contains private header and pkg-config files to be used only by
GNOME control center.
This package is obsoleted by libnma.
%package -n libnma
Summary: Private libraries for NetworkManager GUI support
Group: Development/Libraries
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < %{obsoletes_ver}
%description -n libnma
This package contains private libraries to be used only by nm-applet,
nm-connection editor, and the GNOME Control Center.
%package -n libnma-devel
Summary: Private header files for NetworkManager GUI support
Group: Development/Libraries
Requires: NetworkManager-libnm-devel >= %{nm_version}
Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver}
Requires: libnma = %{version}-%{release}
Requires: gtk3-devel
Requires: pkgconfig
%description -n libnma-devel
This package contains private header and pkg-config files to be used only by
nm-applet, nm-connection-editor, and the GNOME control center.
This package deprecates libnm-gtk.
%prep
%setup -q -n "%{name}-%{real_version}"
%patch1 -p1
%patch2 -p1
%autosetup -p1 -n "%{name}-%{real_version}"
%build
%meson \
-Dgcr=true \
-Dselinux=true \
-Ddisable-static=true \
%if %{with libnm_gtk}
-Dlibnm_gtk=true
%else
-Dlibnm_gtk=false
%endif
-Dappindicator=yes
%meson_build
%install
@ -155,11 +99,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%check
%meson_test
%post -n libnma -p /sbin/ldconfig
%postun -n libnma -p /sbin/ldconfig
%post -n libnm-gtk -p /sbin/ldconfig
%postun -n libnm-gtk -p /sbin/ldconfig
%files
%{_bindir}/nm-applet
@ -187,40 +126,18 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_datadir}/icons/hicolor/*/apps/nm-device-*.*
%{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
%{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
%{_mandir}/man1/nm-connection-editor*
%dir %{_datadir}/gnome-vpn-properties
%if %{with libnm_gtk}
%files -n libnm-gtk
%{_libdir}/libnm-gtk.so.*
%{_libdir}/girepository-1.0/NMGtk-1.0.typelib
%endif
%if %{with libnm_gtk}
%files -n libnm-gtk-devel
%dir %{_includedir}/libnm-gtk
%{_includedir}/libnm-gtk/*.h
%{_libdir}/pkgconfig/libnm-gtk.pc
%{_libdir}/libnm-gtk.so
%{_datadir}/gir-1.0/NMGtk-1.0.gir
%endif
%files -n libnma
%{_libdir}/libnma.so.*
%{_libdir}/girepository-1.0/NMA-1.0.typelib
%files -n libnma-devel
%dir %{_includedir}/libnma
%{_includedir}/libnma/*.h
%{_libdir}/pkgconfig/libnma.pc
%{_libdir}/libnma.so
%{_datadir}/gir-1.0/NMA-1.0.gir
%{_datadir}/gtk-doc
%changelog
* Mon Jun 22 2020 Beniamino Galvani <bgalvani@redhat.com> - 1.18.0-1
- Update to 1.18.0 release (rh #1814748)
* Mon May 18 2020 Beniamino Galvani <bgalvani@redhat.com> - 1.8.22-3
- Drop gschema XML which conflicts with new libnma package
* Thu Aug 15 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.8.22-2
- Update translations (rh #1690001)