From 9f2500421b53a3522c38efb55aae486979644153 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 6 Jan 2021 13:15:56 +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#447d2635b15b92f7a6e80d5f91f0de1b526a9c53 --- network-manager-applet.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/network-manager-applet.spec b/network-manager-applet.spec index 389e5ac..3e2aebf 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 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') @@ -17,6 +17,12 @@ %bcond_without libnma_gtk4 %endif +%if 0%{?fedora} || 0%{?rhel} < 9 +%bcond_without appindicator +%else +%bcond_with appindicator +%endif + Name: network-manager-applet Summary: A network control and status applet for NetworkManager Version: %{rpm_version} @@ -56,10 +62,12 @@ BuildRequires: jansson-devel BuildRequires: gcr-devel BuildRequires: libselinux-devel BuildRequires: mobile-broadband-provider-info-devel -%if 0%{?rhel} < 9 || 0%{?fedora} +%if %{with appindicator} BuildRequires: libappindicator-gtk3-devel %endif +%if 0%{?fedora} || 0%{?rhel} < 9 BuildRequires: libdbusmenu-gtk3-devel +%endif %description This package contains a network control and status notification area applet @@ -82,7 +90,7 @@ utility for use with NetworkManager. -Dgcr=true \ -Dselinux=true \ -Ddisable-static=true \ -%if 0%{?rhel} < 9 || 0%{?fedora} +%if %{with appindicator} -Dappindicator=yes %else -Dappindicator=no @@ -136,6 +144,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %changelog +* Wed Jan 6 2021 Thomas Haller - 1.18.0-3 +- Build without libdbusmenu-gtk3-devel on RHEL >=9 + * Wed Nov 18 2020 Antonio Cardace - 1.18.0-2 - Build without libappindicator-gtk3-devel on RHEL >=9