WALinuxAgent package update

Signed-off-by: virtbuilder_pel7x64builder0 <virtbuilder@powerel.org>

SPECS/WALinuxAgent.spec

@@ -1,22 +1,8 @@
-#===============================================================================
-# Name: walinuxagent.spec
-#-------------------------------------------------------------------------------
-# Purpose : RPM Spec file for Python script packaging
-# Version : 2.2.38
-# Created : April 20 2012
-#===============================================================================
-
 %define name WALinuxAgent
 %define version 2.2.40
 %define unmangled_version 2.2.40
 %define release 1
 
-%if 0%{?rhel} < 7
-%global initsys sysV
-%else
-%global initsys systemd
-%endif
-
 Summary:   The Microsoft Azure Linux Agent
 Name:      %{name}
 Version:   %{version}
@@ -29,7 +15,6 @@ Prefix:    %{_prefix}
 BuildArch: noarch
 Vendor:    Microsoft Corporation <walinuxagent@microsoft.com>
 Url:       https://github.com/Azure/WALinuxAgent
-
 Requires: util-linux
 Requires: net-tools
 Requires: openssh
@@ -38,29 +23,13 @@ Requires: openssl
 Requires: parted
 Requires: python-pyasn1
 Requires: iptables
-
+#Requires:       NetworkManager
-%if %{initsys} == systemd
-Requires:       NetworkManager
-%else
-%if %{initsys} == sysV
-Conflicts:      NetworkManager
-%endif
-%endif
-
-%if %{initsys} == systemd
 BuildRequires:   systemd
 Requires(pre):  systemd
 Requires(post):  systemd
 Requires(preun): systemd
 Requires(postun): systemd
-%else
+
-%if %{initsys} == sysv
-Requires(post):  chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
-%endif
-%endif
 
 %description
 The Azure Linux Agent supports the provisioning and running of Linux
@@ -76,78 +45,35 @@ sed 's/alpine/powerel/g' -i azurelinuxagent/common/version.py
 sed 's/euleros/powerel/g' -i azurelinuxagent/common/version.py
 sed 's/euleros/powerel/g' -i bin/waagent2.0
 
+
 %build
 python setup.py build
 
+
 %install
 python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-%if %{initsys} == systemd
 %systemd_post waagent.service
-%else
+
-%if %{initsys} == sysV
-/sbin/chkconfig --add waagent
-%endif
-%endif
 
 %preun
-%if %{initsys} == systemd
 %systemd_preun waagent.service
-%else
+
-%if %{initsys} == sysV
-if [ $1 = 0 ]; then
-        /sbin/service waagent stop >/dev/null 2>&1
-        /sbin/chkconfig --del waagent
-fi
-%endif
-%endif
 
 %postun
-%if %{initsys} == systemd
 %systemd_postun_with_restart waagent.service
-%else
+
-%if %{initsys} == sysV
-if [ "$1" -ge "1" ]; then
-        /sbin/service waagent restart >/dev/null 2>&1 || :
-fi
-%endif
-%endif
 
 %files -f INSTALLED_FILES
 %{python_sitelib}/*
 %config(noreplace) %{_sysconfdir}/waagent.conf
 %defattr(-,root,root)
 
+
 %changelog
-* Fri Mar 22 2019 - Andrew Pomponio <Andrew.Pomponio@roguewave.com>
-- Updated version to 2.2.38 for release
-* Mon Oct 22 2018 - mike.hagan@roguewave.com
-- Updated version to 2.2.32 for release
-* Fri Sep 24 2018 - mike.hagan@roguewave.com
-- Updated version to 2.2.31 for release
-* Fri Sep 18 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.18 for release
-* Fri Sep 15 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.17 for release
-* Mon Jun 12 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.13 for release
-* Mon May 31 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.12 for release
-* Mon May 15 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.11 for release
-* Mon Apr 19 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.10 for release
-* Mon Apr 19 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.9 for release
-* Mon Mar 28 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.6 for release
-* Mon Feb  6 2017 - mike.hagan@roguewave.com
-- Updated version to 2.2.4 for release
-* Fri Dec 16 2016 - mike.hagan@roguewave.com
-- Updated version to 2.2.2 for release
-* Fri Sep 30 2016 - walinuxagent@microsoft.com
-- Updated version to 2.2.0 for release