diff --git a/nagios-plugins-lcgdm.spec b/nagios-plugins-lcgdm.spec index 71c9196..f0f1219 100644 --- a/nagios-plugins-lcgdm.spec +++ b/nagios-plugins-lcgdm.spec @@ -5,12 +5,11 @@ %define nagios_plugins_dir %{_libdir}/nagios/plugins %define pnp4nagios_templates_dir %{_datadir}/nagios/html/pnp4nagios/templates.lcgdm %define lpylib lfcmetrics -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define pylib %{python_sitelib}/%{lpylib} +%define pylib %{python2_sitelib}/%{lpylib} Name: nagios-plugins-lcgdm Version: 0.9.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Nagios probes to be run remotely against DPM / LFC nodes Group: Applications/Internet License: ASL 2.0 @@ -24,7 +23,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: python +BuildRequires: python2-devel Requires: nagios-plugins-lcgdm-common%{?_isa} = %{version}-%{release} Requires: php%{?_isa} @@ -56,8 +55,8 @@ Group: Applications/System Requires: nagios-common%{?_isa} Requires: nagios-plugins%{?_isa} Requires: nrpe%{?_isa} -Requires: python%{?_isa} -Requires: python-dateutil +Requires: python2%{?_isa} +Requires: python2-dateutil %description -n nagios-plugins-lcgdm-common LCGDM includes both the Disk Pool Manager (DPM) and LCG File Catalog (LFC) @@ -79,7 +78,7 @@ analysis, host certificate checks, etc. Summary: Nagios probes to be run in the DPM head node Group: Applications/System Requires: nagios-plugins-lcgdm-common%{?_isa} = %{version}-%{release} -Requires: python-ldap%{?_isa} +Requires: python2-ldap%{?_isa} %description -n nagios-plugins-dpm-head This package provides the LCGDM nagios probes to be run in the DPM head nodes. @@ -90,6 +89,7 @@ analysis, host certificate checks, etc. Summary: Nagios probes to be run in the LFC node Group: Applications/System Requires: nagios-plugins-lcgdm-common%{?_isa} = %{version}-%{release} +# no python2-lfc yet Requires: lfc-python %description -n nagios-plugins-lfc @@ -115,7 +115,7 @@ make install DESTDIR=%{buildroot} # SAM-3278 install --directory %{buildroot}%{pylib} install --mode 644 plugins/%{lpylib}/*.py %{buildroot}%{pylib} -%{__python} plugins/setup.py install_lib -O1 --skip-build --build-dir=%{lpylib} --install-dir=%{buildroot}%{pylib} +%{__python2} plugins/setup.py install_lib -O1 --skip-build --build-dir=%{lpylib} --install-dir=%{buildroot}%{pylib} %files %config(noreplace) %{_sysconfdir}/nagios/generic-service.cfg @@ -179,6 +179,9 @@ install --mode 644 plugins/%{lpylib}/*.py %{buildroot}%{pylib} %{pylib}/*.py* %changelog +* Fri Jul 20 2018 Miro HronĨok - 0.9.6-9 +- Be explicit about the python used + * Fri Jul 13 2018 Fedora Release Engineering - 0.9.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild