From 4b9a6b468a2ad1b4f011f9b56bb242269acaddc5 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 20 Nov 2020 12:37:44 +0000 Subject: [PATCH] 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 --- network-manager-applet.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/network-manager-applet.spec b/network-manager-applet.spec index 02e742f..389e5ac 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 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 - 1.18.0-2 +- Build without libappindicator-gtk3-devel on RHEL >=9 + * Tue Jul 28 2020 Fedora Release Engineering - 1.18.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild