From 39ae051e821f371ff775e2dfdc551a68e535ee1859d0d8119f157cdb92f2066a Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 27 Apr 2012 10:02:08 +0000 Subject: [PATCH 1/3] Accepting request 115800 from home:HighwayStar:branches:devel:languages:python python3 package added, pygmentize renamed to pygmentize-python3.x in python3 package OBS-URL: https://build.opensuse.org/request/show/115800 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=13 --- python3-Pygments.changes | 5 +++ python3-Pygments.spec | 82 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 python3-Pygments.changes create mode 100644 python3-Pygments.spec diff --git a/python3-Pygments.changes b/python3-Pygments.changes new file mode 100644 index 0000000..8851339 --- /dev/null +++ b/python3-Pygments.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Thu Dec 15 08:28:04 UTC 2011 - highwaystar.ru@gmail.com + +- initial build for python3 + diff --git a/python3-Pygments.spec b/python3-Pygments.spec new file mode 100644 index 0000000..06e3a8e --- /dev/null +++ b/python3-Pygments.spec @@ -0,0 +1,82 @@ +# +# spec file for package python3-Pygments +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +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/Pygments/Pygments-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python3 +BuildRequires: python3-devel +BuildRequires: python3-2to3 +BuildRequires: python3-distribute +#BuildRequires: python-nose + +%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 +Provides: python3-pygments = %{version} +Obsoletes: python3-pygments < %{version} + +%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildArchitectures: noarch +%endif + +%description +Pygments is a syntax highlighting package written in Python. + +It is a generic syntax highlighter for general use in all kinds of software +such as forum systems, wikis or other applications that need to prettify +source code. Highlights are: + + * a wide range of common languages and markup formats is supported + * special attention is paid to details, increasing quality by a fair amount + * support for new languages and formats are added easily + * a number of output formats, presently HTML, LaTeX, RTF, SVG, all image + formats that PIL supports and ANSI sequences + * it is usable as a command-line tool and as a library + * ... and it highlights even Brainfuck! + +%prep +%setup -q -n Pygments-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +install -Dm0644 docs/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize-python%{py3_ver}.1 +mv %{buildroot}%{_bindir}/pygmentize %{buildroot}%{_bindir}/pygmentize-python%{py3_ver} + +%files +%defattr(-,root,root,-) +%doc AUTHORS CHANGES TODO docs/build +%{_bindir}/pygmentize-python%{py3_ver} +%{python3_sitelib}/* +%{_mandir}/man1/pygmentize-python%{py3_ver}.1.gz + +%changelog From d9dd15fe85e5a422fc2c4caba1e472514b8c51da216354e02f586d25b6b53749 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 30 Apr 2012 14:04:43 +0000 Subject: [PATCH 2/3] Accepting request 116064 from devel:languages:python3 Fix building python 3 package on openSUSE 11.4 x86_64 (forwarded request 116063 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/116064 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=14 --- python-Pygments.changes | 5 +++++ python3-Pygments.changes | 5 +++++ python3-Pygments.spec | 15 ++++++--------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/python-Pygments.changes b/python-Pygments.changes index fb589dc..822da69 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 30 13:06:58 UTC 2012 - toddrme2178@gmail.com + +- Fix building python 3 package on openSUSE 11.4 x86_64 + ------------------------------------------------------------------- Mon Mar 12 21:14:22 UTC 2012 - saschpe@gmx.de diff --git a/python3-Pygments.changes b/python3-Pygments.changes index 8851339..7933c59 100644 --- a/python3-Pygments.changes +++ b/python3-Pygments.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 30 13:06:58 UTC 2012 - toddrme2178@gmail.com + +- Fix building python 3 package on openSUSE 11.4 x86_64 + ------------------------------------------------------------------- Thu Dec 15 08:28:04 UTC 2011 - highwaystar.ru@gmail.com diff --git a/python3-Pygments.spec b/python3-Pygments.spec index 06e3a8e..855253a 100644 --- a/python3-Pygments.spec +++ b/python3-Pygments.spec @@ -29,23 +29,20 @@ BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-2to3 BuildRequires: python3-distribute -#BuildRequires: python-nose - +BuildRequires: python3-nose %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)} +%ifarch x86_64 +# to allow ownership of noarch python directories +BuildRequires: python3-32bit %endif -Requires: python(abi) = %{py3_ver} -%if 0%{?suse_version} && 0%{?suse_version} > 1140 -BuildRequires: python3-base %endif +BuildArch: noarch +Requires: python3 >= %{py3_ver} Provides: python3-pygments = %{version} Obsoletes: python3-pygments < %{version} -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} -BuildArchitectures: noarch -%endif - %description Pygments is a syntax highlighting package written in Python. From 1d7925c0f0f4ef29417b3e7adc9b62f63569a92391760def5cd0f4eb57d9ee0f Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 14 May 2012 12:40:45 +0000 Subject: [PATCH 3/3] Accepting request 120936 from home:TheBlackCat:branches:devel:languages:python - Removed files with non-oss license, see bnc#760344 - Cleanups in python 2 and python 3 spec files OBS-URL: https://build.opensuse.org/request/show/120936 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=15 --- python-Pygments.changes | 6 ++++++ python-Pygments.spec | 16 +++++++++++----- python3-Pygments.changes | 6 ++++++ python3-Pygments.spec | 19 +++++++++++++------ 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/python-Pygments.changes b/python-Pygments.changes index 822da69..8452892 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 3 08:40:02 UTC 2012 - toddrme2178@gmail.com + +- Removed files with non-oss license, see bnc#760344 +- Cleanups in python 2 and python 3 spec files + ------------------------------------------------------------------- Mon Apr 30 13:06:58 UTC 2012 - toddrme2178@gmail.com diff --git a/python-Pygments.spec b/python-Pygments.spec index 5ee4472..368dcfd 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -15,15 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -Name: python-Pygments +%define modname Pygments +Name: python-%{modname} 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/Pygments/Pygments-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/P/%{modname}/%{modname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute @@ -53,7 +53,12 @@ source code. Highlights are: * ... and it highlights even Brainfuck! %prep -%setup -q -n Pygments-%{version} +%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 %build python setup.py build @@ -69,7 +74,8 @@ nosetests %defattr(-,root,root,-) %doc AUTHORS CHANGES TODO docs/build %{_bindir}/pygmentize -%{python_sitelib}/* %{_mandir}/man1/pygmentize.1* +%{python_sitelib}/pygments/ +%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info/ %changelog diff --git a/python3-Pygments.changes b/python3-Pygments.changes index 7933c59..73357eb 100644 --- a/python3-Pygments.changes +++ b/python3-Pygments.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 3 08:40:02 UTC 2012 - toddrme2178@gmail.com + +- Removed files with non-oss license, see bnc#760344 +- Cleanups in python 2 and python 3 spec files + ------------------------------------------------------------------- Mon Apr 30 13:06:58 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-Pygments.spec b/python3-Pygments.spec index 855253a..1a5442a 100644 --- a/python3-Pygments.spec +++ b/python3-Pygments.spec @@ -15,22 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -Name: python3-Pygments +%define modname Pygments +Name: python3-%{modname} 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/Pygments/Pygments-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/P/%{modname}/%{modname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-2to3 BuildRequires: python3-distribute BuildRequires: python3-nose -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%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 @@ -59,13 +59,19 @@ source code. Highlights are: * ... and it highlights even Brainfuck! %prep -%setup -q -n Pygments-%{version} +%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 %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} @@ -73,7 +79,8 @@ mv %{buildroot}%{_bindir}/pygmentize %{buildroot}%{_bindir}/pygmentize-python%{p %defattr(-,root,root,-) %doc AUTHORS CHANGES TODO docs/build %{_bindir}/pygmentize-python%{py3_ver} -%{python3_sitelib}/* %{_mandir}/man1/pygmentize-python%{py3_ver}.1.gz +%{python3_sitelib}/pygments/ +%{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info/ %changelog