Hello community,
here is the log from the commit of package python-Sphinx for openSUSE:Factory
checked in at 2012-11-28 14:34:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Sphinx (Old)
and /work/SRC/openSUSE:Factory/.python-Sphinx.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Sphinx", Maintainer is "cth...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Sphinx/python-Sphinx.changes
2012-11-18 21:38:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-Sphinx.new/python-Sphinx.changes
2012-11-28 14:34:47.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 20 11:42:44 UTC 2012 - sasc...@suse.de
+
+- Run testsuite
+- Build and install man-pages
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python-Sphinx/python3-Sphinx.changes
2012-11-13 09:43:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-Sphinx.new/python3-Sphinx.changes
2012-11-28 14:34:47.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 20 17:24:58 UTC 2012 - sasc...@suse.de
+
+- Build and install man-pages
+- Name Python3 binaries consistently:
+ + Fix in setup.py to have correct egg-info data
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Sphinx.spec ++++++
--- /var/tmp/diff_new_pack.YHVJAs/_old 2012-11-28 14:34:48.000000000 +0100
+++ /var/tmp/diff_new_pack.YHVJAs/_new 2012-11-28 14:34:48.000000000 +0100
@@ -30,6 +30,9 @@
BuildRequires: python-devel
BuildRequires: python-distribute
BuildRequires: python-docutils
+# Testsuite build requirements:
+BuildRequires: python-Pygments
+BuildRequires: python-nose
Requires: python-Jinja2
Requires: python-Pygments
Requires: python-distribute
@@ -78,20 +81,27 @@
%build
python setup.py build
-cd doc && make html && rm _build/html/.buildinfo
+python setup.py build_sphinx && rm build/sphinx/html/.buildinfo
+python setup.py build_sphinx -b man
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+install -d %{buildroot}%{_mandir}/man1/
+install -m 644 build/sphinx/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/
%find_lang sphinx
+%check
+nosetests
+
%files -f sphinx.lang
%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE README TODO
%{_bindir}/sphinx-*
+%{_mandir}/man1/sphinx-*
%{python_sitelib}/*
%files doc
%defattr(-,root,root,-)
-%doc EXAMPLES doc/_build/html
+%doc EXAMPLES build/sphinx/html
%changelog
++++++ python3-Sphinx.spec ++++++
--- /var/tmp/diff_new_pack.YHVJAs/_old 2012-11-28 14:34:48.000000000 +0100
+++ /var/tmp/diff_new_pack.YHVJAs/_new 2012-11-28 14:34:48.000000000 +0100
@@ -31,6 +31,9 @@
BuildRequires: python3-devel
BuildRequires: python3-distribute
BuildRequires: python3-docutils
+# Testsuite build requirements:
+BuildRequires: python3-Pygments
+BuildRequires: python3-nose
Requires: python3-Jinja2
Requires: python3-Pygments
Requires: python3-distribute
@@ -72,30 +75,36 @@
%setup -q -n Sphinx-%{version}
%patch0
sed -i '/#\!/d' sphinx/pycode/pgen2/token.py # Fix non-excutable-script warning
+sed -i "s|\(sphinx-.*\) =|\1-%{py3_ver} =|" setup.py # Add Python version
suffix to binaries
+sed -i "s|'\(sphinx-[a-z]*\)'|'\1-%{py3_ver}'|" doc/conf.py # Do the same for
man-pages
%build
2to3 . -w --nobackups
python3 setup.py build
-sed -i 's/python/python3/g' doc/Makefile
-cd doc && make html && rm _build/html/.buildinfo
+python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo # Build HTML
documentation
+python3 setup.py build_sphinx -b man # Build man-pages
%install
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
-for i in %{buildroot}%{_bindir}/*; do
- mv "$i" "${i}-python%{py3_ver}"
-done
+install -d %{buildroot}%{_mandir}/man1/
+install -m 644 build/sphinx/man/*.1 %{buildroot}%{_mandir}/man1/
%fdupes %{buildroot}%{_prefix}
%find_lang sphinx
+#TODO: Fix
+#%%check
+#nosetests-%{py3_ver}
+
%files -f sphinx.lang
%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE README TODO
-%{_bindir}/sphinx-*-python%{py3_ver}
+%{_bindir}/sphinx-*-%{py3_ver}
+%{_mandir}/man1/sphinx-*-%{py3_ver}.1.gz
%{python3_sitelib}/sphinx/
%{python3_sitelib}/Sphinx-%{version}-py%{py3_ver}.egg-info
%files doc
%defattr(-,root,root,-)
-%doc EXAMPLES doc/_build/html
+%doc EXAMPLES build/sphinx/html
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
