Update to 0.4.5

3 files changed, 30 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index f941b3b..96affd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /python-jenkins-0.2.1.tar.gz
 /python-jenkins-0.4.1.tar.gz
+/python-jenkins-0.4.5.tar.gz
diff --git a/python-jenkins.spec b/python-jenkins.spec
index ebda725..9e0a3d9 100644
--- a/python-jenkins.spec
+++ b/python-jenkins.spec
@@ -1,5 +1,5 @@
 Name:           python-jenkins
-Version:        0.4.1
+Version:        0.4.5
 Release:        1%{?dist}
 Summary:        Python bindings for the remote Jenkins API
 
@@ -42,63 +42,78 @@ integration server. It is useful for creating and managing jobs as well as
 build nodes.
 
 %prep
-%setup -q
+%setup -qc
 
+mv %{name}-%{version} python2
+pushd python2
 # 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}|'
+# copy common doc files to top dir
+cp -pr AUTHORS ChangeLog COPYING README.rst ../
+popd
+
+cp -a python2 python3
+find python3 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+find python2 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|'
 
 %build
 export PBR_VERSION=%{version}
 
+pushd python2
 %{__python2} setup.py build
 make -C doc html man
 rm -f doc/build/html/.buildinfo
+popd
 
-pushd %{py3dir}
+pushd python3
 %{__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
+pushd python2
 %{__python2} setup.py install --skip-build --root %{buildroot}
 install -p -D -m0644 doc/build/man/pythonjenkins.1 %{buildroot}%{_mandir}/man1/pythonjenkins.1
+popd
 
-pushd %{py3dir}
+pushd python3
 %{__python3} setup.py install --skip-build --root %{buildroot}
 install -p -D -m0644 doc/build/man/pythonjenkins.1 %{buildroot}%{_mandir}/man1/python3jenkins.1
 popd
 
 %check
+pushd python2
 PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests -w tests
+popd
 
-pushd %{py3dir}
+pushd python3
 PYTHONPATH=%{buildroot}%{python3_sitelib} nosetests-%{python3_version} -w tests
 popd
 
 %files
-%doc COPYING doc/build/html
+%doc AUTHORS ChangeLog README.rst python2/doc/build/html
+%license COPYING
 %{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
+%doc AUTHORS ChangeLog README.rst python3/doc/build/html
+%license COPYING
 %{python3_sitelib}/jenkins
 %{python3_sitelib}/python_jenkins-%{version}-py?.?.egg-info
 %{_mandir}/man1/python3jenkins.1.gz
 
 %changelog
+* Sun Apr 12 2015 Scott K Logan <logans@cottsay.net> - 0.4.5-1
+- Update to 0.4.5
+- Update to latest python packaging guidelines
+
 * 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
diff --git a/sources b/sources
index 9ec770a..709e938 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66f22d9841b34269bf58f5e78e88db51  python-jenkins-0.4.1.tar.gz
+10f1c24d45afe9cadd43f8d60b37d04c  python-jenkins-0.4.5.tar.gz