summaryrefslogtreecommitdiff
path: root/rpm/walinuxagent.spec
diff options
context:
space:
mode:
Diffstat (limited to 'rpm/walinuxagent.spec')
-rw-r--r--rpm/walinuxagent.spec14
1 files changed, 10 insertions, 4 deletions
diff --git a/rpm/walinuxagent.spec b/rpm/walinuxagent.spec
index f20cb64..45a2b42 100644
--- a/rpm/walinuxagent.spec
+++ b/rpm/walinuxagent.spec
@@ -2,25 +2,28 @@
# Name: walinuxagent.spec
#-------------------------------------------------------------------------------
# Purpose : RPM Spec file for Python script packaging
-# Version : 2.0.4
+# Version : 2.0.8
# Created : April 20 2012
#===============================================================================
Name: WALinuxAgent
Summary: The Windows Azure Linux Agent
-Version: 2.0.4
+Version: 2.0.8
Release: 1
License: Apache License Version 2.0
Group: System/Daemons
Url: http://go.microsoft.com/fwlink/?LinkId=250998
-Source0: WALinuxAgent-2.0.4.tar.gz
+Source0: WALinuxAgent-2.0.8.tar.gz
Requires: python python-pyasn1 openssh openssl util-linux sed grep sudo iptables
-Conflicts: NetworkManager
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Vendor: Microsoft Corporation
Packager: Microsoft Corporation <walinuxagent@microsoft.com>
+%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
@@ -69,6 +72,9 @@ fi
%changelog
+* Thu Sep 18 2014 - walinuxagent@microsoft.com
+- Remove NetworkManager conflict for EL7+
+
* Thu Mar 25 2014 - walinuxagent@microsoft.com
- Create directory /var/lib/waagent
- Updated version to 2.0.4 for release