From d5f7f24bd1eed6b5dd1c8624991f05472e37ef461ce805883634356fc557ac4f Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 20 Nov 2012 18:39:47 +0000 Subject: [PATCH 1/2] - 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 From dc3f947d2f952c913f7996a58e899037b45091c54e3e719efa3091cfaf1810bb Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 3 May 2013 22:55:56 +0000 Subject: [PATCH 2/2] Accepting request 174470 from home:TheBlackCat:branches:devel:languages:python Update to version 1.6: OBS-URL: https://build.opensuse.org/request/show/174470 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=18 --- Pygments-1.5.tar.gz | 3 --- Pygments-1.6.tar.gz | 3 +++ python-Pygments.changes | 24 ++++++++++++++++++++++++ python-Pygments.spec | 5 ++--- python3-Pygments.changes | 24 ++++++++++++++++++++++++ python3-Pygments.spec | 5 ++--- 6 files changed, 55 insertions(+), 9 deletions(-) delete mode 100644 Pygments-1.5.tar.gz create mode 100644 Pygments-1.6.tar.gz diff --git a/Pygments-1.5.tar.gz b/Pygments-1.5.tar.gz deleted file mode 100644 index c3ec453..0000000 --- a/Pygments-1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe183e3886f597e41f8c88d0e53c796cefddc879bfdf45f2915a383060436740 -size 3712566 diff --git a/Pygments-1.6.tar.gz b/Pygments-1.6.tar.gz new file mode 100644 index 0000000..e2b840a --- /dev/null +++ b/Pygments-1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0 +size 1423161 diff --git a/python-Pygments.changes b/python-Pygments.changes index 8452892..0fe1727 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri May 3 22:43:21 UTC 2013 - toddrme2178@gmail.com + +- Update to version 1.6: + - Lexers added + - Fix unquoted HTML attribute lexing in Opa . + - The HTML formatter now supports linking to tags using CTags files, when the + python-ctags package is installed . + - The HTML formatter now has a "linespans" option that wraps every line in a + tag with a specific id . + - When deriving a lexer from another lexer with token definitions, definitions + for states not in the child lexer are now inherited. If you override a state + in the child lexer, an "inherit" keyword has been added to insert the base + state at that position . + - The C family lexers now inherit token definitions from a common base class, + removing code duplication . + - Use "colorama" on Windows for console color output . + - Fix Template Haskell highlighting . + - Fix some S/R lexer errors . + - Fix a bug in the Prolog lexer with names that start with 'is' . + - Rewrite Dylan lexer, add Dylan LID lexer . + - Add a Java quickstart document . + - Add a "external/autopygmentize" file that can be used as .lessfilter . + ------------------------------------------------------------------- Thu May 3 08:40:02 UTC 2012 - toddrme2178@gmail.com diff --git a/python-Pygments.spec b/python-Pygments.spec index 7abe25c..0b28481 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -1,7 +1,7 @@ # # spec file for package python-Pygments # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -17,7 +17,7 @@ Name: python-Pygments -Version: 1.5 +Version: 1.6 Release: 0 Url: http://pygments.org Summary: Pygments is a syntax highlighting package written in Python @@ -56,7 +56,6 @@ source code. Highlights are: %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 diff --git a/python3-Pygments.changes b/python3-Pygments.changes index 6fe756f..84852b4 100644 --- a/python3-Pygments.changes +++ b/python3-Pygments.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri May 3 22:43:21 UTC 2013 - toddrme2178@gmail.com + +- Update to version 1.6: + - Lexers added + - Fix unquoted HTML attribute lexing in Opa . + - The HTML formatter now supports linking to tags using CTags files, when the + python-ctags package is installed . + - The HTML formatter now has a "linespans" option that wraps every line in a + tag with a specific id . + - When deriving a lexer from another lexer with token definitions, definitions + for states not in the child lexer are now inherited. If you override a state + in the child lexer, an "inherit" keyword has been added to insert the base + state at that position . + - The C family lexers now inherit token definitions from a common base class, + removing code duplication . + - Use "colorama" on Windows for console color output . + - Fix Template Haskell highlighting . + - Fix some S/R lexer errors . + - Fix a bug in the Prolog lexer with names that start with 'is' . + - Rewrite Dylan lexer, add Dylan LID lexer . + - Add a Java quickstart document . + - Add a "external/autopygmentize" file that can be used as .lessfilter . + ------------------------------------------------------------------- Tue Nov 20 18:40:45 UTC 2012 - saschpe@suse.de diff --git a/python3-Pygments.spec b/python3-Pygments.spec index b98c916..a1c88ee 100644 --- a/python3-Pygments.spec +++ b/python3-Pygments.spec @@ -1,7 +1,7 @@ # # spec file for package python3-Pygments # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -17,7 +17,7 @@ Name: python3-Pygments -Version: 1.5 +Version: 1.6 Release: 0 Url: http://pygments.org Summary: Pygments is a syntax highlighting package written in Python @@ -51,7 +51,6 @@ source code. Highlights are: %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