From b24958170e88b6f2464f689788c90f75b41b7546 Mon Sep 17 00:00:00 2001
From: Terje Røsten <terje.rosten@ntnu.no>
Date: Nov 16 2015 18:39:42 +0000
Subject: Use Python 3


---

diff --git a/pssh-2.3.1-py3-import.patch b/pssh-2.3.1-py3-import.patch
new file mode 100644
index 0000000..d40104f
--- /dev/null
+++ b/pssh-2.3.1-py3-import.patch
@@ -0,0 +1,13 @@
+diff --git a/psshlib/cli.py b/psshlib/cli.py
+index c14b309..ddfe0ee 100644
+--- a/psshlib/cli.py
++++ b/psshlib/cli.py
+@@ -6,7 +6,7 @@ import os
+ import shlex
+ import sys
+ import textwrap
+-import version
++from psshlib import version
+ 
+ _DEFAULT_PARALLELISM = 32
+ _DEFAULT_TIMEOUT     = 0 # "infinity" by default
diff --git a/pssh.spec b/pssh.spec
index 07a7b8a..1861cea 100644
--- a/pssh.spec
+++ b/pssh.spec
@@ -1,18 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
-)}
-
-Summary:   Parallel SSH tools
-Name:      pssh
-Version:   2.3.1
-Release:   8%{?dist}
-License:   BSD
-Url:       http://code.google.com/p/parallel-ssh/
-Group:     Applications/Productivity
-Source0:   http://parallel-ssh.googlecode.com/files/pssh-%{version}.tar.gz
-Requires:  openssh-clients
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-setuptools
+Summary:       Parallel SSH tools
+Name:          pssh
+Version:       2.3.1
+Release:       9%{?dist}
+License:       BSD
+Url:           http://code.google.com/p/parallel-ssh/
+Group:         Applications/Productivity
+Source0:       http://parallel-ssh.googlecode.com/files/pssh-%{version}.tar.gz
+Patch0:        pssh-2.3.1-py3-import.patch
+Requires:      openssh-clients
+BuildArch:     noarch
+BuildRequires: python3-setuptools
 
 %description
 This package provides various parallel tools based on ssh and scp.
@@ -25,29 +22,25 @@ Parallell version includes:
 
 %prep 
 %setup -q
-%{__sed} -i -e '1 d' psshlib/askpass_{client,server}.py
+%patch0 -p1
+sed -i -e '1 d' psshlib/askpass_{client,server}.py
 
 %build
-%{__python} setup.py build
+%{py3_build}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__install} -D -m 0755 %{buildroot}%{_bindir}/pssh-askpass \
+%{py3_install}
+install -D -m 0755 %{buildroot}%{_bindir}/pssh-askpass \
     %{buildroot}%{_libexecdir}/%{name}/pssh-askpass
-%{__rm} -f %{buildroot}%{_bindir}/pssh-askpass
-%{__install} -d %{buildroot}%{_mandir}
-%{__mv} %{buildroot}%{_prefix}/man/man1 %{buildroot}%{_mandir}/man1
-%{__rm} -rf %{buildroot}%{_prefix}/man 
+rm -f %{buildroot}%{_bindir}/pssh-askpass
+install -d %{buildroot}%{_mandir}
+mv %{buildroot}%{_prefix}/man/man1 %{buildroot}%{_mandir}/man1
+rm -rf %{buildroot}%{_prefix}/man
 
 %{__mv} %{buildroot}%{_bindir}/pscp %{buildroot}%{_bindir}/pscp.pssh
 %{__mv} %{buildroot}%{_mandir}/man1/pscp.1 %{buildroot}%{_mandir}/man1/pscp.pssh.1 
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
-%defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING
 %{_bindir}/pnuke
 %{_bindir}/prsync
@@ -60,10 +53,13 @@ Parallell version includes:
 %{_mandir}/man1/pslurp.1*
 %{_mandir}/man1/pssh.1*
 %{_libexecdir}/%{name}
-%{python_sitelib}/%{name}-%{version}*
-%{python_sitelib}/%{name}lib
+%{python3_sitelib}/%{name}-%{version}*
+%{python3_sitelib}/%{name}lib
 
 %changelog
+* Mon Nov 16 2015 Terje Rosten <terje.rosten@ntnu.no> - 2.3.1-3
+- Use Python 3
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild