[python-ansi2html] Fix executable python2/python3 confusion.

Ralph Bean ralph at fedoraproject.org
Wed May 23 16:44:41 UTC 2012


commit c65543e9d233e41e326025e40233adffb80de25b
Author: Ralph Bean <rbean at redhat.com>
Date:   Wed May 23 12:44:23 2012 -0400

    Fix executable python2/python3 confusion.

 python-ansi2html.spec |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/python-ansi2html.spec b/python-ansi2html.spec
index dcdef4b..5f3f2c7 100644
--- a/python-ansi2html.spec
+++ b/python-ansi2html.spec
@@ -4,16 +4,16 @@
 
 %global srcname ansi2html
 
-Name:		python-ansi2html
-Version:	0.9.0
-Release:	2%{?dist}
-Summary:	Python module that converts text with ANSI color to HTML
+Name:       python-ansi2html
+Version:    0.9.0
+Release:    3%{?dist}
+Summary:    Python module that converts text with ANSI color to HTML
 
-Group:		Development/Libraries
-License:	GPLv3+
-URL:		http://github.com/ralphbean/ansi2html
-Source0:	http://pypi.python.org/packages/source/a/ansi2html/ansi2html-%{version}.tar.gz
-BuildArch:	noarch
+Group:      Development/Libraries
+License:    GPLv3+
+URL:        http://github.com/ralphbean/ansi2html
+Source0:    http://pypi.python.org/packages/source/a/ansi2html/ansi2html-%{version}.tar.gz
+BuildArch:  noarch
 
 BuildRequires:  python
 BuildRequires:  python-setuptools
@@ -74,28 +74,36 @@ popd
 %endif
 
 %install
-%{__python} setup.py install --skip-build --root=%{buildroot}
-
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root=%{buildroot}
+mv %{buildroot}/%{_bindir}/ansi2html %{buildroot}/%{_bindir}/python3-ansi2html
 popd
 %endif
 
+%{__python} setup.py install --skip-build --root=%{buildroot}
+
 
 %files
 %doc LICENSE README.rst
-%{python_sitelib}/*
+%{python_sitelib}/ansi2html
+%{python_sitelib}/ansi2html-%{version}-*
 %{_bindir}/ansi2html
 
 %if 0%{?with_python3}
 %files -n python3-ansi2html
 %doc LICENSE README.rst
-%{python3_sitelib}/*
+%{python3_sitelib}/ansi2html
+%{python3_sitelib}/ansi2html-%{version}-*
+%{_bindir}/python3-ansi2html
 %endif
 
 
 %changelog
+* Wed May 23 2012 Ralph Bean <rbean at redhat.com> - 0.9.0-3
+- Fix executable python2/python3 confusion.
+- More explicit ownership of dirs in python_sitelib.
+- Removed mixed use of tabs and spaces.
 * Wed May 09 2012 Ralph Bean <rbean at redhat.com> - 0.9.0-2
 - python3 support.
 * Wed May 09 2012 Ralph Bean <rbean at redhat.com> - 0.9.0-1


More information about the scm-commits mailing list