Update to 0.4.1

Also:
- Switch to PyPI upstream
- Add python3 package

3 files changed, 67 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index 6184566..f941b3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /python-jenkins-0.2.1.tar.gz
+/python-jenkins-0.4.1.tar.gz
diff --git a/python-jenkins.spec b/python-jenkins.spec
index 0fa3638..ebda725 100644
--- a/python-jenkins.spec
+++ b/python-jenkins.spec
@@ -1,53 +1,109 @@
 Name:           python-jenkins
-Version:        0.2.1
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Python bindings for the remote Jenkins API
 
 Group:          Development/Libraries
 License:        BSD
-URL:            http://launchpad.net/python-jenkins
-Source0:        https://launchpad.net/%{name}/0.2/%{version}/+download/%{name}-%{version}.tar.gz
+URL:            http://python-jenkins.readthedocs.org/en/latest
+Source0:        https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
 BuildRequires:  python-mock
 BuildRequires:  python-nose
+BuildRequires:  python-pbr
+BuildRequires:  python-six
 BuildRequires:  python-sphinx
-Requires:       python2
+Requires:       python-pbr
+Requires:       python-six
+
+%package -n python3-jenkins
+Summary:        Python bindings for the remote Jenkins API
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-mock
+BuildRequires:  python3-nose
+BuildRequires:  python3-pbr
+BuildRequires:  python3-six
+BuildRequires:  python3-sphinx
+Requires:       python3-pbr
+Requires:       python3-six
 
 %description
 Python Jenkins is a library for the remote API of the Jenkins continuous
 integration server. It is useful for creating and managing jobs as well as
 build nodes.
 
+%description -n python3-jenkins
+Python Jenkins is a library for the remote API of the Jenkins continuous
+integration server. It is useful for creating and managing jobs as well as
+build nodes.
+
 %prep
 %setup -q
 
 # Remove env from __init__.py
 sed -i '/^#!\/usr\/bin\/env python$/d' jenkins/__init__.py
 
+# Loosen python-pbr requirement
+sed -i 's/pbr>=0.8.2/pbr>=0.8.0/' requirements.txt
+
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+
 %build
+export PBR_VERSION=%{version}
+
 %{__python2} setup.py build
-pushd doc
-make html man
-rm -f build/html/.buildinfo
+make -C doc html man
+rm -f doc/build/html/.buildinfo
+
+pushd %{py3dir}
+%{__python3} setup.py build
+SPHINXBUILD=sphinx-build-%{python3_version} make -C doc html man
+rm -f doc/build/html/.buildinfo
 popd
 
+# Can't get to docs in py3dir (RHBZ #563622)
+cp -a %{py3dir}/doc py3doc
+
 %install
 %{__python2} setup.py install --skip-build --root %{buildroot}
-install -D -m0644 doc/build/man/pythonjenkins.1 %{buildroot}%{_mandir}/man1/pythonjenkins.1
+install -p -D -m0644 doc/build/man/pythonjenkins.1 %{buildroot}%{_mandir}/man1/pythonjenkins.1
+
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+install -p -D -m0644 doc/build/man/pythonjenkins.1 %{buildroot}%{_mandir}/man1/python3jenkins.1
+popd
 
 %check
 PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests -w tests
 
+pushd %{py3dir}
+PYTHONPATH=%{buildroot}%{python3_sitelib} nosetests-%{python3_version} -w tests
+popd
+
 %files
 %doc COPYING doc/build/html
 %{python2_sitelib}/jenkins
 %{python2_sitelib}/python_jenkins-%{version}-py?.?.egg-info
 %{_mandir}/man1/pythonjenkins.1.gz
 
+%files -n python3-jenkins
+%doc COPYING py3doc/build/html
+%{python3_sitelib}/jenkins
+%{python3_sitelib}/python_jenkins-%{version}-py?.?.egg-info
+%{_mandir}/man1/python3jenkins.1.gz
+
 %changelog
+* Wed Nov 12 2014 Scott K Logan <logans@cottsay.net> - 0.4.1-1
+- Update to 0.4.1 (RHBZ #1162743)
+- Switch to PyPI upstream
+- Add python3 package
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b124bf..9ec770a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e9ff3c2e6b0ae8da59a6c46080df898  python-jenkins-0.2.1.tar.gz
+66f22d9841b34269bf58f5e78e88db51  python-jenkins-0.4.1.tar.gz