From 5b4754b297c4abb8e26b77f1822a33f12d5765a3 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 17:46:54 +0000 Subject: [PATCH 01/16] Rebuild for Python 2.6 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 26b86b0..b58d4c9 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.06 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.06-2 +- Rebuild for Python 2.6 + * Fri Oct 24 2008 John Eckersberg - 3.06-1 - New upstream release From b3ea60d0f0562be966b1c3158577154c6280d51b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 18 Feb 2009 19:45:37 +0000 Subject: [PATCH 02/16] Upload newest upstream 3.08 --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index 520c1fd..a9b5195 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ PyYAML-3.06.tar.gz +PyYAML-3.08.tar.gz diff --git a/sources b/sources index d97f5d5..b61c036 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz +a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From 7a85b8d15f1e6e3bdccd00474a00a1a04cc05c00 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 18 Feb 2009 20:11:35 +0000 Subject: [PATCH 03/16] - Update to 3.08 release - Don't build noarch (see: https://www.redhat.com/archives/fedora-devel-list/2007-November/msg0142 7.html) --- PyYAML.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index b58d4c9..7061b4a 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,8 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyYAML -Version: 3.06 -Release: 2%{?dist} +Version: 3.08 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: python-devel, python-setuptools %description @@ -53,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 18 2009 John Eckersberg - 3.08-1 +- New upstream release + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.06-2 - Rebuild for Python 2.6 From 94d52e0d04bbc51c1675ba985669deabab048647 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 23 Feb 2009 22:40:03 +0000 Subject: [PATCH 04/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7061b4a..dd89eea 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 3.08-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 18 2009 John Eckersberg - 3.08-1 - New upstream release From ffab6384b19e90ada5e905aa2bd0594993bb85af Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 27 Feb 2009 02:19:28 +0000 Subject: [PATCH 05/16] remove old sources entry --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index b61c036..084d250 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From e452fffddcb2350ab43e5d625b26f48ec93f90d3 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 3 Mar 2009 00:55:40 +0000 Subject: [PATCH 06/16] Add libyaml to BuildRequires --- PyYAML.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index dd89eea..e374219 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,7 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, python-setuptools +BuildRequires: python-devel, python-setuptools, libyaml %description YAML is a data serialization format designed for human readability and @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 2 2009 John Eckersberg - 3.08-3 +- Add libyaml to BuildRequires + * Mon Feb 23 2009 Fedora Release Engineering - 3.08-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 3a057b6195b1ac5fc8627930fd42b851bd5f5d5d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 3 Mar 2009 18:13:47 +0000 Subject: [PATCH 07/16] fix buildrequires s/libyaml/libyaml-devel/ --- PyYAML.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index e374219..f93697b 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,7 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, python-setuptools, libyaml +BuildRequires: python-devel, python-setuptools, libyaml-devel %description YAML is a data serialization format designed for human readability and @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 3 2009 John Eckersberg - 3.08-4 +- Correction, change libyaml to libyaml-devel in BuildRequires + * Mon Mar 2 2009 John Eckersberg - 3.08-3 - Add libyaml to BuildRequires From 78db20dc553f0f8969459ec05d6f00fc2c952a3b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 22 Jul 2009 18:49:39 +0000 Subject: [PATCH 08/16] - Minor tweaks to spec file aligning with latest Fedora packaging guidelines - Enforce inclusion of libyaml in build with --with-libyaml option to setup.py - Deliver to %%{python_sitearch} instead of %%{python_sitelib} due to _yaml.so - Thanks to Gareth Armstrong --- PyYAML.spec | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index f93697b..9572405 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,15 +1,17 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +#====================================================================# Name: PyYAML Version: 3.08 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python-devel, python-setuptools, libyaml-devel @@ -20,38 +22,43 @@ emitter for Python. PyYAML features a complete YAML 1.1 parser, Unicode support, pickle support, capable extension API, and sensible error messages. PyYAML -supports standard YAML tags and provides Python-specific tags that allow -to represent an arbitrary Python object. +supports standard YAML tags and provides Python-specific tags that +allow to represent an arbitrary Python object. PyYAML is applicable for a broad range of tasks from complex configuration files to object serialization and persistance. %prep %setup -q -n %{name}-%{version} - - -%build -%{__python} setup.py build chmod a-x examples/yaml-highlight/yaml_hl.py +%build +CFLAGS="${RPM_OPT_FLAGS}" %{__python} setup.py --with-libyaml build + + %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +rm -rf %{buildroot} +%{__python} setup.py install -O1 --skip-build --root %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc PKG-INFO README LICENSE examples -%{python_sitelib}/* +%doc CHANGES LICENSE PKG-INFO README examples +%{python_sitearch}/* %changelog +* Wed Jul 22 2009 - John Eckersberg - 3.08-5 +- Minor tweaks to spec file aligning with latest Fedora packaging guidelines +- Enforce inclusion of libyaml in build with --with-libyaml option to setup.py +- Deliver to %%{python_sitearch} instead of %%{python_sitelib} due to _yaml.so +- Thanks to Gareth Armstrong + * Tue Mar 3 2009 John Eckersberg - 3.08-4 - Correction, change libyaml to libyaml-devel in BuildRequires From bbb12f2735210e888ec56cf5eed4c88ee3c6925e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:05:06 +0000 Subject: [PATCH 09/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 9572405..3badd51 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.08 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.08-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Jul 22 2009 - John Eckersberg - 3.08-5 - Minor tweaks to spec file aligning with latest Fedora packaging guidelines - Enforce inclusion of libyaml in build with --with-libyaml option to setup.py From 92400218667e8fa38e197c9658d38ba0e2744a5e Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 2 Oct 2009 14:03:30 +0000 Subject: [PATCH 10/16] New upstream release 3.09 --- .cvsignore | 3 +-- PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index a9b5195..89555f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -PyYAML-3.06.tar.gz -PyYAML-3.08.tar.gz +PyYAML-3.09.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 3badd51..8b6ce82 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -3,8 +3,8 @@ #====================================================================# Name: PyYAML -Version: 3.08 -Release: 6%{?dist} +Version: 3.09 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Fri Oct 02 2009 John Eckersberg - 3.09-1 +- New upstream release 3.09 + * Fri Jul 24 2009 Fedora Release Engineering - 3.08-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 084d250..c484ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz +f219af2361e87fdc5e85e95b84c11d87 PyYAML-3.09.tar.gz From 677cf61c30822dff419d40c58a2be64a83ed3eb9 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 24 Nov 2009 19:46:22 +0000 Subject: [PATCH 11/16] bump spec --- PyYAML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 8b6ce82..45c3595 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries From 0a861404072a6de53783002ea8ebaf18713360b6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:32:05 +0000 Subject: [PATCH 12/16] 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 df5dee3..a0a01e5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := PyYAML 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 24544973e06ce7786841bfc46e0ea38b07ada042 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 00:28:58 +0000 Subject: [PATCH 13/16] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 45c3595..7a60da3 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Wed Jul 21 2010 David Malcolm - 3.09-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Fri Oct 02 2009 John Eckersberg - 3.09-1 - New upstream release 3.09 From 9c0bf5e8e65be00e7664d73d465bc0a78445f7e2 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 27 Jul 2010 09:38:37 +0000 Subject: [PATCH 14/16] - Bump release number for upgrade path --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7a60da3..51730a2 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 3%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Tue Jul 27 2010 Mamoru Tasaka - 3.09-5 +- Bump release number for upgrade path + * Wed Jul 21 2010 David Malcolm - 3.09-3 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From b2d86cc5084d8216eeb4cf714d8955dec44f1582 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 27 Jul 2010 09:43:33 +0000 Subject: [PATCH 15/16] Oops... build target wrong --- PyYAML.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 51730a2..c9dacea 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,7 +53,7 @@ rm -rf %{buildroot} %changelog -* Tue Jul 27 2010 Mamoru Tasaka - 3.09-5 +* Tue Jul 27 2010 Mamoru Tasaka - 3.09-6 - Bump release number for upgrade path * Wed Jul 21 2010 David Malcolm - 3.09-3 From bd4200327e53d8fae0fa5495acea7ce0e4d7ea69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:14:01 +0000 Subject: [PATCH 16/16] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 a0a01e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyYAML -# $Id$ -NAME := PyYAML -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)