diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2015-03-25 11:04:05 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2015-04-10 23:48:27 +0000 |
| commit | 84a3d292f81a5fa2c827eca3b31501f2c3d973e5 (patch) | |
| tree | 165d3033645468cfa6b852e88f8377c2d3408967 /rpm/walinuxagent.spec | |
| parent | 2761a00bd67c512b1e47619f6f945ba2e4c7f83c (diff) | |
| parent | 5b26ef33dbffbb2cebbfb996f8799d131dc842ae (diff) | |
| download | vyos-walinuxagent-84a3d292f81a5fa2c827eca3b31501f2c3d973e5.tar.gz vyos-walinuxagent-84a3d292f81a5fa2c827eca3b31501f2c3d973e5.zip | |
Import patches-applied version 2.0.12-0ubuntu1 to applied/ubuntu/vivid-proposed
Imported using git-ubuntu import.
Changelog parent: 2761a00bd67c512b1e47619f6f945ba2e4c7f83c
Unapplied parent: 5b26ef33dbffbb2cebbfb996f8799d131dc842ae
New changelog entries:
* New upstream release.
* Added debian/watch for easier maintenance.
* Fix regression of missing dataloss warning by adding systemd unit file.
Diffstat (limited to 'rpm/walinuxagent.spec')
| -rw-r--r-- | rpm/walinuxagent.spec | 14 |
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 |