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#9e2f2eb60ee83e5f0a0c16786938e3feeb1127c5
This commit is contained in:
DistroBaker 2020-11-20 12:37:44 +00:00
parent 904711c153
commit 4b9a6b468a

View File

@ -7,7 +7,7 @@
%global rpm_version 1.18.0
%global real_version 1.18.0
%global release_version 1
%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')
@ -56,7 +56,9 @@ BuildRequires: jansson-devel
BuildRequires: gcr-devel
BuildRequires: libselinux-devel
BuildRequires: mobile-broadband-provider-info-devel
%if 0%{?rhel} < 9 || 0%{?fedora}
BuildRequires: libappindicator-gtk3-devel
%endif
BuildRequires: libdbusmenu-gtk3-devel
%description
@ -80,7 +82,11 @@ utility for use with NetworkManager.
-Dgcr=true \
-Dselinux=true \
-Ddisable-static=true \
%if 0%{?rhel} < 9 || 0%{?fedora}
-Dappindicator=yes
%else
-Dappindicator=no
%endif
%meson_build
%install
@ -130,6 +136,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%changelog
* Wed Nov 18 2020 Antonio Cardace <acardace@redhat.com> - 1.18.0-2
- Build without libappindicator-gtk3-devel on RHEL >=9
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild