From af06141c98d5fc7a9a1a7f6a3a875cf59a6b05be Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jan 27 2014 08:06:08 +0000 Subject: import PyYAML-3.10-11.el7.src.rpm --- diff --git a/SOURCES/PyYAML-size_t_not_int.patch b/SOURCES/PyYAML-size_t_not_int.patch new file mode 100644 index 0000000..d4065ed --- /dev/null +++ b/SOURCES/PyYAML-size_t_not_int.patch @@ -0,0 +1,61 @@ +--- pyyaml-3.10.orig/ext/_yaml.pxd 2011-05-29 23:31:01.000000000 -0400 ++++ pyyaml-3.10/ext/_yaml.pxd 2012-06-08 16:33:54.309407701 -0400 +@@ -86,15 +86,15 @@ + YAML_MAPPING_END_EVENT + + ctypedef int yaml_read_handler_t(void *data, char *buffer, +- int size, int *size_read) except 0 ++ size_t size, size_t *size_read) except 0 + + ctypedef int yaml_write_handler_t(void *data, char *buffer, +- int size) except 0 ++ size_t size) except 0 + + ctypedef struct yaml_mark_t: +- int index +- int line +- int column ++ size_t index ++ size_t line ++ size_t column + ctypedef struct yaml_version_directive_t: + int major + int minor +@@ -113,7 +113,7 @@ + char *suffix + ctypedef struct _yaml_token_scalar_data_t: + char *value +- int length ++ size_t length + yaml_scalar_style_t style + ctypedef struct _yaml_token_version_directive_data_t: + int major +@@ -152,7 +152,7 @@ + char *anchor + char *tag + char *value +- int length ++ size_t length + int plain_implicit + int quoted_implicit + yaml_scalar_style_t style +--- pyyaml-3.10.orig/ext/_yaml.pyx 2011-05-29 23:31:01.000000000 -0400 ++++ pyyaml-3.10/ext/_yaml.pyx 2012-06-08 16:33:54.313409701 -0400 +@@ -905,7 +905,7 @@ + raise error + return 1 + +-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: ++cdef int input_handler(void *data, char *buffer, size_t size, size_t *read) except 0: + cdef CParser parser + parser = data + if parser.stream_cache is None: +@@ -1515,7 +1515,7 @@ + self.ascend_resolver() + return 1 + +-cdef int output_handler(void *data, char *buffer, int size) except 0: ++cdef int output_handler(void *data, char *buffer, size_t size) except 0: + cdef CEmitter emitter + emitter = data + if emitter.dump_unicode == 0: diff --git a/SPECS/PyYAML.spec b/SPECS/PyYAML.spec index 2d46edf..94cfd2c 100644 --- a/SPECS/PyYAML.spec +++ b/SPECS/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 8%{?dist} +Release: 11%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -14,7 +14,7 @@ License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: python-devel, python-setuptools, libyaml-devel +BuildRequires: python-devel, python-setuptools, libyaml-devel, Cython Provides: python-yaml = %{version}-%{release} Provides: python-yaml%{?_isa} = %{version}-%{release} %if 0%{?with_python3} @@ -22,6 +22,9 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %endif +# http://pyyaml.org/ticket/247 +Patch0: PyYAML-size_t_not_int.patch + %description YAML is a data serialization format designed for human readability and interaction with scripting languages. PyYAML is a YAML parser and @@ -58,6 +61,10 @@ configuration files to object serialization and persistance. %prep %setup -q -n %{name}-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py +%patch0 -p1 +pushd ext +cython _yaml.pyx +popd %if 0%{?with_python3} rm -rf %{py3dir} @@ -114,6 +121,15 @@ rm -rf %{buildroot} %changelog +* Fri Jan 24 2014 Daniel Mach - 3.10-11 +- Mass rebuild 2014-01-24 + +* Tue Jan 7 2014 John Eckersberg - 3.10-10 +- Add patch to fix build issue on s390x (bz1048898) + +* Fri Dec 27 2013 Daniel Mach - 3.10-9 +- Mass rebuild 2013-12-27 + * Thu Aug 8 2013 John Eckersberg - 3.10-8 - Add check section and run test suite