From 88cef1aabf5e1d486ab2398366c79ac7b895c0c4 Mon Sep 17 00:00:00 2001
From: Charalampos Stratakis <cstratak@redhat.com>
Date: Nov 29 2016 13:47:44 +0000
Subject: Remove runtime requirement of python-argparse as argparse is now in

python's stdlib and require python2 instead.

Change python-ply and python-sphinx dependencies to python2-ply and
python2-sphinx as the packages provides the python2 namespace.

Some SPEC file modernization.

---

diff --git a/nordugrid-arc-nagios-plugins.spec b/nordugrid-arc-nagios-plugins.spec
index 86923fb..1a64c42 100644
--- a/nordugrid-arc-nagios-plugins.spec
+++ b/nordugrid-arc-nagios-plugins.spec
@@ -17,7 +17,7 @@
 
 Name:		nordugrid-arc-nagios-plugins
 Version:	1.8.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Nagios plugins for ARC
 
 Group:		System Environment/Daemons
@@ -27,10 +27,10 @@ Source0:	http://download.nordugrid.org/packages/%{name}/releases/%{version}/src/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	nordugrid-arc-client >= 1.0.0
 Requires:	nordugrid-arc-python >= 1.0.0
-Requires:	python-argparse
+Requires:	python2
 Requires:	python-ldap
 Requires:	python-genshi
-Requires:	python-ply
+Requires:	python2-ply
 Requires:	nagios-plugins
 Requires:	glue-schema >= 2.0.8
 %if %{?rhel}%{!?rhel:0} == 5
@@ -39,7 +39,7 @@ Requires:	python-sqlite
 %endif
 BuildRequires:	python2-devel
 %if %{enable_doc}
-BuildRequires:	python-sphinx
+BuildRequires:	python2-sphinx
 %endif
 
 %description
@@ -73,15 +73,14 @@ EGI configuration and dependencies for the ARC Nagios plugins.
 %setup -q
 
 %build
-%{__python2} setup.py build
+%py2_build
 %if %{enable_doc}
 make -C doc html
 rm -f doc/_build/html/.buildinfo
 %endif
 
 %install
-rm -rf %{buildroot}
-%{__python2} setup.py install --root=%{buildroot} --skip-build
+%py2_install
 
 install -m755 -d %{buildroot}%{pkg_spooldir}
 
@@ -89,9 +88,6 @@ install -m755 -d %{buildroot}%{pkg_spooldir}
 chmod 644 %{buildroot}%{pkg_sysconfdir}/60-egi.d/arcce_igtf.py
 sed 1d -i %{buildroot}%{pkg_sysconfdir}/60-egi.d/arcce_igtf.py
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %dir %{pkg_sysconfdir}
 %dir %{pkg_sysconfdir}/20-dist.d
@@ -132,6 +128,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{pkg_sysconfdir}/60-egi.d/arcce_igtf.py*
 
 %changelog
+* Mon Nov 21 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.8.4-6
+- Remove runtime requirement for python-argparse
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.4-5
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages