https://bugzilla.redhat.com/show_bug.cgi?id=1328892
--- Comment #5 from Matthew Barnes <mbarnes(a)redhat.com> ---
Updated spec and srpm.
Turns out I was packaging the wrong documentation files. I don't think a
separate -doc subpackage is needed at this time; it's just a few text files.
Switched the package over to Python 3, but tests are still broken due to some
bugs in dependencies. (Also, our tests are written for Python 2 and it looks
like some Python 3 compatibility issues have crept in.)
The rpmlint errors I'm inclined to dismiss. The script-without-shebang errors
are for files that are not scripts, and the "rcX" will soon be dropped from the
version.
Also, the range of acceptable Ansible versions needs to be extended for what's
available in Fedora. I'm looking into that but I'm not sure it needs to block
the package review.
Let me know if I missed anything.
----
SRPM URL:
https://mbarnes.fedorapeople.org/commissaire/commissaire-0.0.1rc3-2.fc23....
Spec diff:
@@ -1,6 +1,6 @@
Name: commissaire
Version: 0.0.1rc3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple cluster host management
License: GPLv3+
URL:
http://github.com/projectatomic/commissaire
@@ -8,25 +8,28 @@ Source0:
https://github.com/proje
BuildArch: noarch
-BuildRequires: python-devel
+BuildRequires: python3-devel
+BuildRequires: systemd
# For docs
-BuildRequires: python-sphinx
+BuildRequires: python3-sphinx
# For tests
-BuildRequires: python-coverage
-BuildRequires: python-mock
-BuildRequires: python-nose
-BuildRequires: python-flake8
+%if %{with tests}
+BuildRequires: python3-coverage
+BuildRequires: python3-mock
+BuildRequires: python3-nose
+BuildRequires: python3-flake8
+%endif
BuildRequires: pkgconfig(systemd)
-Requires: python-setuptools
-Requires: python-cherrypy
-Requires: python2-falcon
-Requires: python2-python-etcd
-Requires: python-jinja2
-Requires: python-requests
-Requires: py-bcrypt
+Requires: python3-setuptools
+Requires: python3-cherrypy
+Requires: python3-falcon
+Requires: python3-python-etcd
+Requires: python3-jinja2
+Requires: python3-requests
+Requires: python3-py-bcrypt
# Ansible's Python API has no stability guarantees,
# so keep the acceptable versions on a short leash.
@@ -51,19 +54,19 @@ Example tasks include:
%build
-%py2_build
+%py3_build
# Build docs
-%{__python2} setup.py build_sphinx -c doc -b text
+%{__python3} setup.py build_sphinx -b text
%install
-%py2_install
+%py3_install
install -D contrib/systemd/commissaire
%{buildroot}%{_sysconfdir}/sysconfig/commissaire
install -D contrib/systemd/commissaire.service
%{buildroot}%{_unitdir}/commissaire.service
%check
# XXX: Issue with the coverage module.
-#%{__python2} setup.py nosetests
+#%{__python3} setup.py nosetests
%post
%systemd_post %{name}
@@ -77,18 +80,23 @@ install -D contrib/systemd/commissaire.s
%files
-%license COPYING
+%license LICENSE
%doc README.md
%doc CONTRIBUTORS
%doc MAINTAINERS
-%doc doc/apidoc/*.rst
+%doc build/sphinx/text/*.txt
%{_bindir}/commissaire
-%{python2_sitelib}/*
+%{python3_sitelib}/*
%{_sysconfdir}/sysconfig/commissaire
%{_unitdir}/commissaire.service
%changelog
+* Thu Jun 02 2016 Matthew Barnes <mbarnes(a)redhat.com> - 0.0.1rc3-2
+- Switch to python3, drop RHEL hackarounds for Fedora.
+- Package the correct documentation files.
+- Add BR: systemd
+
* Tue Apr 19 2016 Matthew Barnes <mbarnes(a)redhat.com> - 0.0.1rc3-1
- Update for RC3.
--
You are receiving this mail because:
You are on the CC list for the bug.
You are always notified about changes to this product and component