From da7f54d35350c218d36d62d0419247ef5c87b4b9 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Tue, 9 Jun 2020 14:49:27 +0200
Subject: [PATCH] Update to 2.2.48.1 (#1641605)

Split udev rules to a separate subpackage (#1748432)

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 .gitignore        |  1 +
 WALinuxAgent.spec | 22 +++++++++++++++++-----
 sources           |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index fe2029e..6489f14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /WALinuxAgent-2.2.38.tar.gz
 /WALinuxAgent-2.2.40.tar.gz
 /WALinuxAgent-2.2.46.tar.gz
+/v2.2.48.1.tar.gz
diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec
index 1a7acb3..4fa47c9 100644
--- a/WALinuxAgent.spec
+++ b/WALinuxAgent.spec
@@ -1,19 +1,20 @@
 %global with_legacy 0
 
 Name:           WALinuxAgent
-Version:        2.2.46
-Release:        2%{?dist}
+Version:        2.2.48.1
+Release:        1%{?dist}
 Summary:        The Microsoft Azure Linux Agent
 
 License:        ASL 2.0
 URL:            https://github.com/Azure/%{name}
-Source0:        https://github.com/Azure/%{name}/archive/%{name}-%{version}.tar.gz
+Source0:        https://github.com/Azure/%{name}/archive/v%{version}.tar.gz
 
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-distro
+Requires:       %name-udev = %version-%release
 Requires:       ntfsprogs
 Requires:       openssh
 Requires:       openssh-server
@@ -42,6 +43,12 @@ Requires:	net-tools
 The Microsoft Azure Linux Agent supporting old version of extensions.
 %endif
 
+%package udev
+Summary:        Udev rules for Microsoft Azure
+
+%description udev
+Udev rules specific to Microsoft Azure Virtual Machines.
+
 %prep
 %setup -q
 
@@ -90,18 +97,23 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/waagent-extn.logrotate %{buildroot}%{_
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-extn
 %{_sbindir}/waagent
 %config(noreplace) %{_sysconfdir}/waagent.conf
-%{_udevrulesdir}/66-azure-storage.rules
-%{_udevrulesdir}/99-azure-product-uuid.rules
 %{_unitdir}/waagent.service
 %{python3_sitelib}/azurelinuxagent
 %{python3_sitelib}/*.egg-info
 
+%files udev
+%{_udevrulesdir}/*.rules
+
 %if 0%{?with_legacy}
 %files legacy
 %{_sbindir}/waagent2.0
 %endif
 
 %changelog
+* Tue Jun 09 2020 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.48.1-1
+- Update to 2.2.48.1 (#1641605)
+- Split udev rules to a separate subpackage (#1748432)
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.2.46-2
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index 465cdff..74fc3c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (WALinuxAgent-2.2.46.tar.gz) = a2f0bd162e6edcf35b5e56695dcbf66d3b71a57717aa8d6470f9d9652ba9363d6e1d93a06bb6c8a918c80310b3825e5cac266d02a1ba5423dab3983899acf750
+SHA512 (v2.2.48.1.tar.gz) = 139c0b8d8696efdc570f44a63ee828d35ec162ee6a279ceba1a2b7d6ca4d6f99b7c428a4726286ca12b641c5957c3f1050b25a9d233e7a5bb559c8cef97bce0d