From 04c60e1623c1fb4dfd7f6175e108f89fb9cc693e Mon Sep 17 00:00:00 2001 From: Yue Zhang Date: Wed, 8 Jul 2015 16:52:32 +0800 Subject: [PATCH] Remove conflict of Network Manager for Redhat7 --- rpm/redhat6x.spec | 3 --- rpm/redhat7x.spec | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/rpm/redhat6x.spec b/rpm/redhat6x.spec index 4ca4ffa..1811448 100644 --- a/rpm/redhat6x.spec +++ b/rpm/redhat6x.spec @@ -19,10 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Vendor: Microsoft Corporation Packager: Microsoft Corporation - -%if 0%{?rhel} < 7 Conflicts: NetworkManager -%endif %description The Azure Linux Agent supports the provisioning and running of Linux diff --git a/rpm/redhat7x.spec b/rpm/redhat7x.spec index 80bdcf3..aa705bb 100644 --- a/rpm/redhat7x.spec +++ b/rpm/redhat7x.spec @@ -20,14 +20,10 @@ BuildArch: noarch Vendor: Microsoft Corporation Packager: Microsoft Corporation -%if 0%{?rhel} < 7 -Conflicts: NetworkManager -%endif - %description The Windows Azure Linux Agent supports the provisioning and running of Linux -VMs in the Windows Azure cloud. This package should be installed on Linux disk -images that are built to run in the Windows Azure environment. +VMs in the Microsoft Azure cloud. This package should be installed on Linux disk +images that are built to run in the Microsoft Azure environment. %prep %setup -q