From 6f9515596f0b4e01381c3b17bb78b12bfce1e5d0 Mon Sep 17 00:00:00 2001 From: smilner Date: Fri, 17 Aug 2007 20:46:41 +0000 Subject: [PATCH 01/23] removed the dos2unix build dep --- python-pygments.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/python-pygments.spec b/python-pygments.spec index e124700..e248df6 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -2,7 +2,7 @@ Name: python-pygments Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -12,7 +12,7 @@ Source0: http://cheeseshop.python.org/packages/source/P/Pygments/Pygments BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel, python-setuptools, dos2unix +BuildRequires: python-devel, python-setuptools %description @@ -28,7 +28,7 @@ markup. %build %{__python} setup.py build -dos2unix LICENSE +%{__sed} -i 's/\r//' LICENSE %install @@ -52,5 +52,7 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 17 2007 Steve 'Ashcrow' Milner - 0.8.1-2 +- Removed the dos2unix build dependency. * Thu Jun 28 2007 Steve 'Ashcrow' Milner - 0.8.1-1 - Initial packaging for Fedora. From f57f1d00a6ab4b8ff47140cef5b54f17ffb634f9 Mon Sep 17 00:00:00 2001 From: smilner Date: Tue, 13 Nov 2007 00:23:16 +0000 Subject: [PATCH 02/23] updated for upstream 0.9 --- .cvsignore | 2 +- python-pygments.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9e87662..f5fc475 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Pygments-0.8.1.tar.gz +Pygments-0.9.tar.gz diff --git a/python-pygments.spec b/python-pygments.spec index e248df6..b2a9b41 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pygments -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -52,7 +52,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 12 2007 Steve 'Ashcrow' Milner - 0.9-1 +- Updated for upstream 0.9. + * Thu Aug 17 2007 Steve 'Ashcrow' Milner - 0.8.1-2 - Removed the dos2unix build dependency. + * Thu Jun 28 2007 Steve 'Ashcrow' Milner - 0.8.1-1 - Initial packaging for Fedora. diff --git a/sources b/sources index 6dfcccc..be52c39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f71971cbe9db538a40ea808ac5da3dc0 Pygments-0.8.1.tar.gz +8cdce901a66c0febb576955e90814485 Pygments-0.9.tar.gz From 0ec0697846757cce4c2db5f06ce2c333bcaca99e Mon Sep 17 00:00:00 2001 From: smilner Date: Thu, 29 Nov 2007 13:54:40 +0000 Subject: [PATCH 03/23] added python-setuptools as a Requires per bz#403601 --- python-pygments.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-pygments.spec b/python-pygments.spec index b2a9b41..92f1285 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel, python-setuptools +Requires: python-setuptools %description From 9c9043808e5cc67904aa0e872ec8ad517af6ab75 Mon Sep 17 00:00:00 2001 From: smilner Date: Thu, 29 Nov 2007 13:57:09 +0000 Subject: [PATCH 04/23] updated changelog and release --- python-pygments.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index 92f1285..f676ad9 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -2,7 +2,7 @@ Name: python-pygments Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 29 2007 Steve 'Ashcrow' Milner - 0.9-2 +- Added python-setuptools as a Requires per bz#403601. + * Mon Nov 12 2007 Steve 'Ashcrow' Milner - 0.9-1 - Updated for upstream 0.9. From f99f1e3b971b29ad5e1829e8d95250e492486925 Mon Sep 17 00:00:00 2001 From: smilner Date: Tue, 22 Jul 2008 01:39:28 +0000 Subject: [PATCH 05/23] updated for upstream 0.10 --- .cvsignore | 2 +- python-pygments.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f5fc475..fd105ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Pygments-0.9.tar.gz +Pygments-0.10.tar.gz diff --git a/python-pygments.spec b/python-pygments.spec index f676ad9..35460e3 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pygments -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 21 2008 Steve 'Ashcrow' Milner - 0.10-1 +- Updated for upstream 0.10. + * Thu Nov 29 2007 Steve 'Ashcrow' Milner - 0.9-2 - Added python-setuptools as a Requires per bz#403601. diff --git a/sources b/sources index be52c39..0b7bce6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cdce901a66c0febb576955e90814485 Pygments-0.9.tar.gz +1f24bee773010d0d53690a6f4bdc8bdb Pygments-0.10.tar.gz From fb080f00d8d91ba041f30fc1e870e207e22ad42f Mon Sep 17 00:00:00 2001 From: smilner Date: Sun, 14 Sep 2008 22:55:59 +0000 Subject: [PATCH 06/23] Updating to 0.11.1 per upstream release. --- .cvsignore | 2 +- import.log | 1 + python-pygments.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index fd105ae..4ea68ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Pygments-0.10.tar.gz +Pygments-0.11.1.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..c5629b4 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +python-pygments-0_11_1-1_fc10:HEAD:python-pygments-0.11.1-1.fc10.src.rpm:1221432893 diff --git a/python-pygments.spec b/python-pygments.spec index 35460e3..d7f1820 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pygments -Version: 0.10 +Version: 0.11.1 Release: 1%{?dist} Summary: A syntax highlighting engine written in Python @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Sep 14 2008 Steve 'Ashcrow' Milner - 0.11.1-1 +- Updated for upstream 0.11. + * Mon Jul 21 2008 Steve 'Ashcrow' Milner - 0.10-1 - Updated for upstream 0.10. diff --git a/sources b/sources index 0b7bce6..cc7cd35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f24bee773010d0d53690a6f4bdc8bdb Pygments-0.10.tar.gz +a7dc555f316437ba5241855ac306209a Pygments-0.11.1.tar.gz From 56a4fd65849aa2333ab956099bb5e14560a5b0d9 Mon Sep 17 00:00:00 2001 From: smilner Date: Fri, 28 Nov 2008 03:18:51 +0000 Subject: [PATCH 07/23] Updating for new upstream release. --- .cvsignore | 2 +- python-pygments.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ea68ea..4c23eda 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Pygments-0.11.1.tar.gz +Pygments-1.0.tar.gz diff --git a/python-pygments.spec b/python-pygments.spec index d7f1820..e8b9626 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pygments -Version: 0.11.1 +Version: 1.0 Release: 1%{?dist} Summary: A syntax highlighting engine written in Python @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 27 2008 Steve 'Ashcrow' Milner - 1.0-1 +- Updated for upstream 1.0. + * Sun Sep 14 2008 Steve 'Ashcrow' Milner - 0.11.1-1 - Updated for upstream 0.11. diff --git a/sources b/sources index cc7cd35..e036efb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a7dc555f316437ba5241855ac306209a Pygments-0.11.1.tar.gz +70c40ff5331460cabfcb24f86a8d451d Pygments-1.0.tar.gz From 667fe57bd4ef815a264964883c0a1b2412d569eb Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 15:52:20 +0000 Subject: [PATCH 08/23] Rebuild for Python 2.6 --- python-pygments.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index e8b9626..d1423a7 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -2,7 +2,7 @@ Name: python-pygments Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.0-2 +- Rebuild for Python 2.6 + * Fri Nov 27 2008 Steve 'Ashcrow' Milner - 1.0-1 - Updated for upstream 1.0. From 68fa276495fe412dc7e171bd224022ab08274dbc Mon Sep 17 00:00:00 2001 From: smilner Date: Mon, 22 Dec 2008 01:59:24 +0000 Subject: [PATCH 09/23] Updated for release. --- python-pygments.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index d1423a7..4f81bb7 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -2,7 +2,7 @@ Name: python-pygments Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 21 2008 Steve 'Ashcrow' Milner - 1.0-3 +- Updated for release. + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.0-2 - Rebuild for Python 2.6 From 4f4cb1fd84354fc31110580b104358d6ce9798d0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 23:09:48 +0000 Subject: [PATCH 10/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- python-pygments.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index 4f81bb7..96e71a8 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -2,7 +2,7 @@ Name: python-pygments Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Dec 21 2008 Steve 'Ashcrow' Milner - 1.0-3 - Updated for release. From 2cffb5cfeb08d35977e0ce5747df0dd5a4f7eae2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 26 Jul 2009 20:56:10 +0000 Subject: [PATCH 11/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- python-pygments.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index 96e71a8..0e5231c 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -2,7 +2,7 @@ Name: python-pygments Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 7172f0ec0b6eabcd7aafe07cbbbb9f3ea89f130e Mon Sep 17 00:00:00 2001 From: smilner Date: Tue, 29 Sep 2009 22:49:11 +0000 Subject: [PATCH 12/23] Updated for current release. --- .cvsignore | 2 +- python-pygments.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4c23eda..2ce680d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Pygments-1.0.tar.gz +Pygments-1.1.1.tar.gz diff --git a/python-pygments.spec b/python-pygments.spec index 0e5231c..b479022 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pygments -Version: 1.0 -Release: 5%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 29 2009 Steve 'Ashcrow' Milner - 1.1.1-1 +- Updated for release. + * Sun Jul 26 2009 Fedora Release Engineering - 1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index e036efb..ba7e931 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70c40ff5331460cabfcb24f86a8d451d Pygments-1.0.tar.gz +80ac64669a75e2d6647822b2778e38c8 Pygments-1.1.1.tar.gz From 596badfd69738c4a73c9d9809a2d7d4bc7b2c81e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:59 +0000 Subject: [PATCH 13/23] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 48695ce..75a4632 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := python-pygments SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 42e427b8ee7aff8c35ee0dfbafb60f2166daf3ff Mon Sep 17 00:00:00 2001 From: smilner Date: Sat, 6 Mar 2010 23:59:33 +0000 Subject: [PATCH 14/23] update for upstream release --- .cvsignore | 2 +- python-pygments.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2ce680d..b74f675 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Pygments-1.1.1.tar.gz +Pygments-1.3.1.tar.gz diff --git a/python-pygments.spec b/python-pygments.spec index b479022..2738848 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pygments -Version: 1.1.1 +Version: 1.3.1 Release: 1%{?dist} Summary: A syntax highlighting engine written in Python @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Mar 6 2010 Steve 'Ashcrow' Milner - 1.3.1-1 +- Updated for release. + * Tue Sep 29 2009 Steve 'Ashcrow' Milner - 1.1.1-1 - Updated for release. diff --git a/sources b/sources index ba7e931..ec85a6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80ac64669a75e2d6647822b2778e38c8 Pygments-1.1.1.tar.gz +54be67c04834f13d7e255e1797d629a5 Pygments-1.3.1.tar.gz From 71d2ba9e1543885e247594ffb45a4f41f4a009c2 Mon Sep 17 00:00:00 2001 From: smilner Date: Tue, 13 Apr 2010 14:04:16 +0000 Subject: [PATCH 15/23] update for BZ 581663 --- python-pygments.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-pygments.spec b/python-pygments.spec index 2738848..af28538 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -2,7 +2,7 @@ Name: python-pygments Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel, python-setuptools -Requires: python-setuptools +Requires: python-setuptools, python-imaging %description @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 13 2010 Steve 'Ashcrow' Milner - 1.3.1-2 +- added python-imaging as a dependency per BZ#581663. + * Sat Mar 6 2010 Steve 'Ashcrow' Milner - 1.3.1-1 - Updated for release. From 9faf8bd9dc3fe9ac09966e1f63d3b0b3afdb6fc3 Mon Sep 17 00:00:00 2001 From: smilner Date: Fri, 23 Apr 2010 15:25:43 +0000 Subject: [PATCH 16/23] added Dave Malcolm's patch from BZ 537244 --- python-pygments.spec | 48 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index af28538..3fbf6f1 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,8 +1,10 @@ +%global with_python3 0 + %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pygments Version: 1.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -15,6 +17,9 @@ BuildArch: noarch BuildRequires: python-devel, python-setuptools Requires: python-setuptools, python-imaging +%if 0%{?with_python3} +BuildRequires: python3-devel, python3-setuptools +%endif # if with_python3 %description Pygments is a syntax highlighting engine written in Python. That means, it @@ -22,18 +27,50 @@ will take source code (or other markup) in a supported language and output a processed version (in different formats) containing syntax highlighting markup. +%if 0%{?with_python3} +%package -n python3-pygments +Summary: A syntax highlighting engine written in Python 3 +Group: Development/Libraries +Requires: python3-setuptools + +%description -n python3-pygments +Pygments is a syntax highlighting engine written in Python. That means, it +will take source code (or other markup) in a supported language and output +a processed version (in different formats) containing syntax highlighting +markup. +%endif # if with_python3 + %prep %setup -q -n Pygments-%{version} +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' +%endif # with_python3 %build %{__python} setup.py build %{__sed} -i 's/\r//' LICENSE +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +popd +%endif # with_python3 %install rm -rf $RPM_BUILD_ROOT + +# Run the Python 3 build first so that the Python 2 version of +# /usr/bin/pygmentize "wins": +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +popd +%endif # with_python3 + mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT mv docs/pygmentize.1 $RPM_BUILD_ROOT%{_mandir}/man1/pygmentize.1 @@ -51,8 +88,17 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/pygmentize %lang(en) %{_mandir}/man1/pygmentize.1.gz +%if 0%{?with_python3} +%files -n python3-pygments +%defattr(-,root,root,-) +%doc AUTHORS CHANGES docs/ LICENSE TODO +%{python3_sitelib}/* +%endif # with_python3 %changelog +* Fri Apr 23 2010 David Malcolm - 1.3.1-3 +- add python3 subpackage (BZ#537244), ignoring soft-dep on imaging for now + * Sat Apr 13 2010 Steve 'Ashcrow' Milner - 1.3.1-2 - added python-imaging as a dependency per BZ#581663. From d30218c903233e4b43fb4240d8556ed35bc9cd58 Mon Sep 17 00:00:00 2001 From: smilner Date: Fri, 23 Apr 2010 17:22:52 +0000 Subject: [PATCH 17/23] reenabled with_python3 --- python-pygments.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-pygments.spec b/python-pygments.spec index 3fbf6f1..800a32e 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,10 +1,10 @@ -%global with_python3 0 +%global with_python3 1 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pygments Version: 1.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %endif # with_python3 %changelog +* Fri Apr 23 2010 Steve 'Ashcrow' Milner - 1.3.1-4 +- switched with_python3 back to 1 + * Fri Apr 23 2010 David Malcolm - 1.3.1-3 - add python3 subpackage (BZ#537244), ignoring soft-dep on imaging for now From 59ce0a5685f2d9b81be1f14b6fbadf245120c61c Mon Sep 17 00:00:00 2001 From: smilner Date: Wed, 12 May 2010 16:41:17 +0000 Subject: [PATCH 18/23] added enhancements to the spec from Gareth Armstrong --- python-pygments.spec | 78 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 61 insertions(+), 17 deletions(-) diff --git a/python-pygments.spec b/python-pygments.spec index 800a32e..081559d 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,31 +1,41 @@ %global with_python3 1 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%global upstream_name Pygments Name: python-pygments Version: 1.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries License: BSD URL: http://pygments.org/ -Source0: http://cheeseshop.python.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz +Source0: http://pypi.python.org/packages/source/P/%{upstream_name}/%{upstream_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel, python-setuptools -Requires: python-setuptools, python-imaging - +BuildRequires: python2-devel >= 2.4, python-setuptools, python-nose %if 0%{?with_python3} BuildRequires: python3-devel, python3-setuptools %endif # if with_python3 +Requires: python-setuptools, python-imaging + %description -Pygments is a syntax highlighting engine written in Python. That means, it -will take source code (or other markup) in a supported language and output -a processed version (in different formats) containing syntax highlighting -markup. +Pygments 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 that increase highlighting + quality + * support for new languages and formats are added easily; most + languages use a simple regex-based lexing mechanism + * a number of output formats is available, among them HTML, RTF, + LaTeX and ANSI sequences + * it is usable as a command-line tool and as a library + * ... and it highlights even Brainf*ck! %if 0%{?with_python3} %package -n python3-pygments @@ -34,10 +44,19 @@ Group: Development/Libraries Requires: python3-setuptools %description -n python3-pygments -Pygments is a syntax highlighting engine written in Python. That means, it -will take source code (or other markup) in a supported language and output -a processed version (in different formats) containing syntax highlighting -markup. +Pygments 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 that increase highlighting + quality + * support for new languages and formats are added easily; most + languages use a simple regex-based lexing mechanism + * a number of output formats is available, among them HTML, RTF, + LaTeX and ANSI sequences + * it is usable as a command-line tool and as a library + * ... and it highlights even Brainf*ck! %endif # if with_python3 @@ -50,6 +69,7 @@ cp -a . %{py3dir} find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %endif # with_python3 + %build %{__python} setup.py build %{__sed} -i 's/\r//' LICENSE @@ -60,6 +80,7 @@ pushd %{py3dir} popd %endif # with_python3 + %install rm -rf $RPM_BUILD_ROOT @@ -71,18 +92,33 @@ pushd %{py3dir} popd %endif # with_python3 -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -mv docs/pygmentize.1 $RPM_BUILD_ROOT%{_mandir}/man1/pygmentize.1 +pushd docs +install -d %{buildroot}%{_mandir}/man1 +mv pygmentize.1 $RPM_BUILD_ROOT%{_mandir}/man1/pygmentize.1 +mv build html +mv src reST +popd %clean rm -rf $RPM_BUILD_ROOT +%check +make test + +# nose is not Python3 ready yet +%if 0%{?with_python3} +pushd %{py3dir} +#make test +popd +%endif # with_python3 + + %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES docs/ LICENSE TODO +%doc AUTHORS CHANGES docs/html docs/reST LICENSE TODO # For noarch packages: sitelib %{python_sitelib}/* %{_bindir}/pygmentize @@ -91,11 +127,19 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_python3} %files -n python3-pygments %defattr(-,root,root,-) -%doc AUTHORS CHANGES docs/ LICENSE TODO +%doc AUTHORS CHANGES docs/html docs/reST LICENSE TODO %{python3_sitelib}/* %endif # with_python3 + %changelog +* Thu May 6 2010 Gareth Armstrong - 1.3.1-5 +- Enforce that Pygments requires Python 2.4 or later via an explicit BR +- Minor tweaks to spec file +- Deliver html and reST doc files to specifically named directories +- Align description with that of http://pygments.org/ +- Add %%check section for Python2 and add BR on python-nose + * Fri Apr 23 2010 Steve 'Ashcrow' Milner - 1.3.1-4 - switched with_python3 back to 1 From 070d6a2a84f382734a9c84892ecb194b2697131b Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 05:10:36 +0000 Subject: [PATCH 19/23] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- python-pygments.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index 081559d..5b7d5d5 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -5,7 +5,7 @@ Name: python-pygments Version: 1.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -133,6 +133,9 @@ popd %changelog +* Thu Jul 22 2010 David Malcolm - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Thu May 6 2010 Gareth Armstrong - 1.3.1-5 - Enforce that Pygments requires Python 2.4 or later via an explicit BR - Minor tweaks to spec file From 4b4d755d4a7286b51b0ad0b73b445bb3995406c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:39:25 +0000 Subject: [PATCH 20/23] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 75a4632..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-pygments -# $Id$ -NAME := python-pygments -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index c5629b4..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -python-pygments-0_11_1-1_fc10:HEAD:python-pygments-0.11.1-1.fc10.src.rpm:1221432893 From 5a670f80e057b72d54c93a5e6ef3b2aadfcd8818 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 25 Aug 2010 17:56:53 +0200 Subject: [PATCH 21/23] rebuild with python3.2 http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html --- python-pygments.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/python-pygments.spec b/python-pygments.spec index 5b7d5d5..539a028 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -1,11 +1,14 @@ +%if 0%{?fedora} > 12 || 0%{?rhel} > 6 %global with_python3 1 +%else +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} +%endif -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %global upstream_name Pygments Name: python-pygments Version: 1.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -133,6 +136,11 @@ popd %changelog +* Wed Aug 25 2010 Thomas Spura - 1.3.1-7 +- update to most recent python guidelines +- rebuild with python3.2 + http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html + * Thu Jul 22 2010 David Malcolm - 1.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 0630807f2b447cad3949d6a3fad425d1a459698d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 23:58:54 -0600 Subject: [PATCH 22/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- python-pygments.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index 539a028..583eb78 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -8,7 +8,7 @@ Name: python-pygments Version: 1.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -136,6 +136,9 @@ popd %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Aug 25 2010 Thomas Spura - 1.3.1-7 - update to most recent python guidelines - rebuild with python3.2 From 612557d7017ff5d74a4db8909429fe50c84cd7e9 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Fri, 24 Jun 2011 10:18:29 -0400 Subject: [PATCH 23/23] added EL5 py2.6 and updated to 1.4 --- .gitignore | 1 + python-pygments.spec | 71 ++++++++++++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b74f675..178cb1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ Pygments-1.3.1.tar.gz +/Pygments-1.4.tar.gz diff --git a/python-pygments.spec b/python-pygments.spec index 539a028..c18cae0 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -4,11 +4,23 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif +%if 0%{?el5} +%global with_python26 1 +%endif + +%if 0%{?with_python26} +%global __python26 %{_bindir}/python2.6 +%global py26dir %{_builddir}/python26-%{name}-%{version}-%{release} +%global python26_sitelib %{_libdir}/python2.6/site-packages +#Disable byte compileing and do ourselves later. +%endif + + %global upstream_name Pygments Name: python-pygments -Version: 1.3.1 -Release: 7%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: A syntax highlighting engine written in Python Group: Development/Libraries @@ -23,6 +35,11 @@ BuildRequires: python2-devel >= 2.4, python-setuptools, python-nose BuildRequires: python3-devel, python3-setuptools %endif # if with_python3 Requires: python-setuptools, python-imaging +%if 0%{?with_python26} +BuildRequires: python26-devel, python26-distribute +Requires: python26-distribute, python26-imaging +Requires: python(abi) = 2.6 +%endif %description @@ -62,6 +79,18 @@ need to prettify source code. Highlights are: * ... and it highlights even Brainf*ck! %endif # if with_python3 +%if 0%{?with_python26} +%package -n python26-pygments +Summary: A syntax highlighting engine written in Python 2.6 +Group: Development/Libraries +Requires: python26-distribute + +%description -n python26-pygments +Pygments 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: +%endif #end of python2.6 + %prep %setup -q -n Pygments-%{version} @@ -72,6 +101,12 @@ cp -a . %{py3dir} find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %endif # with_python3 +%if 0%{?with_python26} +rm -rf %{py26dir} +cp -a . %{py26dir} +find %{py26dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python26}|' +%endif # with_python26 + %build %{__python} setup.py build @@ -83,6 +118,12 @@ pushd %{py3dir} popd %endif # with_python3 +%if 0%{?with_python26} +pushd %{py26dir} +%{__python26} setup.py build +popd +%endif # with_python26 + %install rm -rf $RPM_BUILD_ROOT @@ -95,6 +136,14 @@ pushd %{py3dir} popd %endif # with_python3 +# Run the Python 2.6 build first so that the Python 2 version of +# /usr/bin/pygmentize "wins": +%if 0%{?with_python26} +pushd %{py26dir} +%{__python26} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +popd +%endif # with_python26 + %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT pushd docs install -d %{buildroot}%{_mandir}/man1 @@ -103,6 +152,13 @@ mv build html mv src reST popd +%if 0%{?with_python26} +%{__python} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", '"10"', "%{python_sitelib}", 1)' > /dev/null +%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", '"10"', "%{python_sitelib}", 1)' > /dev/null +%{__python26} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", '"10"', "%{python26_sitelib}", 1)' > /dev/null +%{__python26} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", '"10"', "%{python26_sitelib}", 1)' > /dev/null +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -134,8 +190,19 @@ popd %{python3_sitelib}/* %endif # with_python3 +%if 0%{?with_python26} +%files -n python26-pygments +%defattr(-,root,root,-) +%doc AUTHORS CHANGES docs/ LICENSE TODO +%{python26_sitelib}/* +%endif # with_python26 + %changelog +* Fri Jun 24 2011 Steve Milner - 1.4-1 +- update for upstream release +- Add python2.6 support done by Steve Traylen . BZ#662755. + * Wed Aug 25 2010 Thomas Spura - 1.3.1-7 - update to most recent python guidelines - rebuild with python3.2 diff --git a/sources b/sources index ec85a6a..f517dae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54be67c04834f13d7e255e1797d629a5 Pygments-1.3.1.tar.gz +d77ac8c93a7fb27545f2522abe9cc462 Pygments-1.4.tar.gz