Hello community, here is the log from the commit of package python-Sphinx for openSUSE:Factory checked in at 2012-11-13 09:43:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Sphinx (Old) and /work/SRC/openSUSE:Factory/.python-Sphinx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Sphinx", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Sphinx/python-Sphinx.changes 2012-05-29 11:44:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Sphinx.new/python-Sphinx.changes 2012-11-13 09:43:18.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 6 00:24:32 UTC 2012 - [email protected] + +- Remove obsolete SUSE version checks +- Don't package locale files twice + +------------------------------------------------------------------- python3-Sphinx.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Sphinx.spec ++++++ --- /var/tmp/diff_new_pack.xUQRtU/_old 2012-11-13 09:43:19.000000000 +0100 +++ /var/tmp/diff_new_pack.xUQRtU/_new 2012-11-13 09:43:19.000000000 +0100 @@ -25,6 +25,7 @@ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes BuildRequires: python-Jinja2 BuildRequires: python-devel BuildRequires: python-distribute @@ -33,19 +34,14 @@ Requires: python-Pygments Requires: python-distribute Requires: python-docutils -%if 0%{?suse_version} Suggests: python-rst2pdf -%py_requires -%if 0%{?suse_version} > 1010 -BuildRequires: fdupes -%endif -%if 0%{?suse_version} > 1110 -BuildArch: noarch -%endif -%endif Provides: python-sphinx = %{version} Obsoletes: python-sphinx < %{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else +BuildArch: noarch +%endif %description Sphinx is a tool that makes it easy to create intelligent and beautiful @@ -78,20 +74,14 @@ %prep %setup -q -n Sphinx-%{version} -sed -i '1d' sphinx/pycode/pgen2/token.py # Remove she-bang line +sed -i '/#\!/d' sphinx/pycode/pgen2/token.py # Fix non-excutable-script warning %build python setup.py build -cd doc && make html -rm _build/html/.buildinfo -mv _build/html .. -rm -rf _* +cd doc && make html && rm _build/html/.buildinfo %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%if 0%{?suse_version} > 1010 -%fdupes %{buildroot}%{_prefix} -%endif %find_lang sphinx %files -f sphinx.lang @@ -99,9 +89,10 @@ %doc AUTHORS CHANGES LICENSE README TODO %{_bindir}/sphinx-* %{python_sitelib}/* +%exclude %{python_sitelib}/sphinx/locale/ %files doc %defattr(-,root,root,-) -%doc EXAMPLES html +%doc EXAMPLES doc/_build/html %changelog ++++++ python3-Sphinx.spec ++++++ --- /var/tmp/diff_new_pack.xUQRtU/_old 2012-11-13 09:43:19.000000000 +0100 +++ /var/tmp/diff_new_pack.xUQRtU/_new 2012-11-13 09:43:19.000000000 +0100 @@ -25,35 +25,19 @@ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz Patch0: python3-Sphinx-docs.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes +BuildRequires: python3-2to3 BuildRequires: python3-Jinja2 BuildRequires: python3-devel -BuildRequires: python3-2to3 BuildRequires: python3-distribute BuildRequires: python3-docutils Requires: python3-Jinja2 Requires: python3-Pygments Requires: python3-distribute Requires: python3-docutils -%if 0%{?suse_version} Suggests: python3-rst2pdf -%if 0%{?suse_version} > 1010 -BuildRequires: fdupes -%endif -%endif - -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 -%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} -%endif -Requires: python(abi) = %{py3_ver} -%if 0%{?suse_version} && 0%{?suse_version} > 1140 -BuildRequires: python3-base -%endif - -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} -BuildArchitectures: noarch -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Sphinx is a tool that makes it easy to create intelligent and beautiful @@ -87,25 +71,20 @@ %prep %setup -q -n Sphinx-%{version} %patch0 -sed -i '1d' sphinx/pycode/pgen2/token.py # Remove she-bang line +sed -i '/#\!/d' sphinx/pycode/pgen2/token.py # Fix non-excutable-script warning %build 2to3 . -w --nobackups python3 setup.py build sed -i 's/python/python3/g' doc/Makefile -cd doc && make html -rm _build/html/.buildinfo -mv _build/html .. -rm -rf _* +cd doc && make html && rm _build/html/.buildinfo %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} for i in %{buildroot}%{_bindir}/*; do mv "$i" "${i}-python%{py3_ver}" done -%if 0%{?suse_version} > 1010 %fdupes %{buildroot}%{_prefix} -%endif %find_lang sphinx %files -f sphinx.lang @@ -117,6 +96,6 @@ %files doc %defattr(-,root,root,-) -%doc EXAMPLES html +%doc EXAMPLES doc/_build/html %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
