From d5f7f24bd1eed6b5dd1c8624991f05472e37ef461ce805883634356fc557ac4f Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 20 Nov 2012 18:39:47 +0000 Subject: [PATCH] - Name Python3 binaries consistently: + Fix in setup.py to have correct egg-info data OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=17 --- python-Pygments.spec | 18 ++++++++---------- python3-Pygments.changes | 6 ++++++ python3-Pygments.spec | 41 ++++++++++++++-------------------------- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/python-Pygments.spec b/python-Pygments.spec index 368dcfd..7abe25c 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -15,15 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define modname Pygments -Name: python-%{modname} + +Name: python-Pygments Version: 1.5 Release: 0 Url: http://pygments.org Summary: Pygments is a syntax highlighting package written in Python License: BSD-2-Clause Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/P/%{modname}/%{modname}-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute @@ -53,12 +53,10 @@ source code. Highlights are: * ... and it highlights even Brainfuck! %prep -%setup -q -n %{modname}-%{version} -# remove non-oss licensed files, see bnc# 760344 -rm tests/examplefiles/Sorting.mod -rm tests/examplefiles/test.mod -rm tests/examplefiles/output/Sorting.mod -rm tests/examplefiles/output/test.mod +%setup -q -n Pygments-%{version} +# Remove non-oss licensed files, see bnc# 760344 +rm tests/examplefiles/{Sorting,test}.mod +rm tests/examplefiles/output/{Sorting,test}.mod %build python setup.py build @@ -76,6 +74,6 @@ nosetests %{_bindir}/pygmentize %{_mandir}/man1/pygmentize.1* %{python_sitelib}/pygments/ -%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info/ +%{python_sitelib}/Pygments-%{version}-py%{py_ver}.egg-info/ %changelog diff --git a/python3-Pygments.changes b/python3-Pygments.changes index 73357eb..6fe756f 100644 --- a/python3-Pygments.changes +++ b/python3-Pygments.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 20 18:40:45 UTC 2012 - saschpe@suse.de + +- Name Python3 binaries consistently: + + Fix in setup.py to have correct egg-info data + ------------------------------------------------------------------- Thu May 3 08:40:02 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-Pygments.spec b/python3-Pygments.spec index 1a5442a..b98c916 100644 --- a/python3-Pygments.spec +++ b/python3-Pygments.spec @@ -15,33 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define modname Pygments -Name: python3-%{modname} + +Name: python3-Pygments Version: 1.5 Release: 0 Url: http://pygments.org Summary: Pygments is a syntax highlighting package written in Python License: BSD-2-Clause Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/P/%{modname}/%{modname}-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 -BuildRequires: python3-devel BuildRequires: python3-2to3 +BuildRequires: python3-devel BuildRequires: python3-distribute BuildRequires: python3-nose -%if 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)} -%ifarch x86_64 -# to allow ownership of noarch python directories -BuildRequires: python3-32bit -%endif -%endif BuildArch: noarch -Requires: python3 >= %{py3_ver} -Provides: python3-pygments = %{version} -Obsoletes: python3-pygments < %{version} %description Pygments is a syntax highlighting package written in Python. @@ -59,28 +48,26 @@ source code. Highlights are: * ... and it highlights even Brainfuck! %prep -%setup -q -n %{modname}-%{version} -# remove non-oss licensed files, see bnc# 760344 -rm tests/examplefiles/Sorting.mod -rm tests/examplefiles/test.mod -rm tests/examplefiles/output/Sorting.mod -rm tests/examplefiles/output/test.mod +%setup -q -n Pygments-%{version} +# Remove non-oss licensed files, see bnc# 760344 +rm tests/examplefiles/{Sorting,test}.mod +rm tests/examplefiles/output/{Sorting,test}.mod +sed -i "s|pygmentize|pygmentize-%{py3_ver}|" setup.py # Add Python3 version suffix %build python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -# rename binary file and man file to avoid conflicts with the python 2 version -install -Dm0644 docs/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize-python%{py3_ver}.1 -mv %{buildroot}%{_bindir}/pygmentize %{buildroot}%{_bindir}/pygmentize-python%{py3_ver} +# Rename man-page to avoid conflicts with the python 2 version +install -Dm0644 docs/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize-%{py3_ver}.1 %files %defattr(-,root,root,-) %doc AUTHORS CHANGES TODO docs/build -%{_bindir}/pygmentize-python%{py3_ver} -%{_mandir}/man1/pygmentize-python%{py3_ver}.1.gz +%{_bindir}/pygmentize-%{py3_ver} +%{_mandir}/man1/pygmentize-%{py3_ver}.1.gz %{python3_sitelib}/pygments/ -%{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info/ +%{python3_sitelib}/Pygments-%{version}-py%{py3_ver}.egg-info/ %changelog