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#447d2635b15b92f7a6e80d5f91f0de1b526a9c53
This commit is contained in:
DistroBaker 2021-01-06 13:15:56 +00:00
parent a977eb641e
commit 9f2500421b

View File

@ -7,7 +7,7 @@
%global rpm_version 1.18.0 %global rpm_version 1.18.0
%global real_version 1.18.0 %global real_version 1.18.0
%global release_version 2 %global release_version 3
%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') %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')
@ -17,6 +17,12 @@
%bcond_without libnma_gtk4 %bcond_without libnma_gtk4
%endif %endif
%if 0%{?fedora} || 0%{?rhel} < 9
%bcond_without appindicator
%else
%bcond_with appindicator
%endif
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: %{rpm_version}
@ -56,10 +62,12 @@ BuildRequires: jansson-devel
BuildRequires: gcr-devel BuildRequires: gcr-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: mobile-broadband-provider-info-devel BuildRequires: mobile-broadband-provider-info-devel
%if 0%{?rhel} < 9 || 0%{?fedora} %if %{with appindicator}
BuildRequires: libappindicator-gtk3-devel BuildRequires: libappindicator-gtk3-devel
%endif %endif
%if 0%{?fedora} || 0%{?rhel} < 9
BuildRequires: libdbusmenu-gtk3-devel BuildRequires: libdbusmenu-gtk3-devel
%endif
%description %description
This package contains a network control and status notification area applet This package contains a network control and status notification area applet
@ -82,7 +90,7 @@ utility for use with NetworkManager.
-Dgcr=true \ -Dgcr=true \
-Dselinux=true \ -Dselinux=true \
-Ddisable-static=true \ -Ddisable-static=true \
%if 0%{?rhel} < 9 || 0%{?fedora} %if %{with appindicator}
-Dappindicator=yes -Dappindicator=yes
%else %else
-Dappindicator=no -Dappindicator=no
@ -136,6 +144,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%changelog %changelog
* Wed Jan 6 2021 Thomas Haller <thaller@redhat.com> - 1.18.0-3
- Build without libdbusmenu-gtk3-devel on RHEL >=9
* Wed Nov 18 2020 Antonio Cardace <acardace@redhat.com> - 1.18.0-2 * Wed Nov 18 2020 Antonio Cardace <acardace@redhat.com> - 1.18.0-2
- Build without libappindicator-gtk3-devel on RHEL >=9 - Build without libappindicator-gtk3-devel on RHEL >=9