Update to 0.2.6

Fix for type demotion issues on s390x
Resolves: BZ#2042422
This commit is contained in:
Jakub Čajka 2022-05-12 13:42:03 +02:00
parent 62e1459626
commit 6d0cc7080f
4 changed files with 50 additions and 7 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/ruamel.yaml.clib-0.1.2.tar.gz
/ruamel-yaml-clib-code-955989c1f022b95ca1f92bf0abd761ef8aa0b940.zip
/ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e.zip

38
fix-typecasts-s390x.patch Normal file
View File

@ -0,0 +1,38 @@
diff -up ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pxd.s390x ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pxd
--- ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pxd.s390x 2022-05-11 17:33:41.727476439 +0200
+++ ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pxd 2022-05-11 17:34:34.197700039 +0200
@@ -86,10 +86,10 @@ cdef extern from "_ruamel_yaml.h":
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
diff -up ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pyx.s390x ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pyx
--- ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pyx.s390x 2022-05-12 13:05:17.540913818 +0200
+++ ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pyx 2022-05-12 13:06:38.211269280 +0200
@@ -904,7 +904,7 @@ cdef class CParser:
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 = <CParser>data
if parser.stream_cache is None:
@@ -1514,7 +1514,7 @@ cdef class CEmitter:
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 = <CEmitter>data
if emitter.dump_unicode == 0:
diff -up ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/yaml.h.s390x ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/yaml.h

View File

@ -1,17 +1,16 @@
%global pypi_name ruamel.yaml.clib
%global pname ruamel-yaml-clib
# This means version 0.1.2:
%global hash 955989c1f022b95ca1f92bf0abd761ef8aa0b940
%global hash 85e484db2b7c37107e4edd2ae6fc380877bbc08e
Name: python-%{pname}
Version: 0.1.2
Release: 9%{?dist}
Version: 0.2.6
Release: 1%{?dist}
Summary: C version of reader, parser and emitter for ruamel.yaml derived from libyaml
License: MIT
URL: https://bitbucket.org/ruamel/yaml.clib
Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml-clib/code/ruamel-yaml-clib-code-%{hash}.zip
Patch0: fix-typecasts-s390x.patch
BuildRequires: gcc
BuildRequires: libyaml-devel
@ -40,7 +39,7 @@ rm -v $(grep -rl '/\* Generated by Cython')
# cython refuses to cythonize a file in a directory that cannot be a Python module ¯\_(ツ)_/¯
mkdir ruamel.yaml.clib
mv *.pyx ruamel.yaml.clib
cythonize ruamel.yaml.clib/*.pyx
cythonize -3 ruamel.yaml.clib/*.pyx
mv ruamel.yaml.clib/* .
rmdir ruamel.yaml.clib
@ -56,6 +55,11 @@ rmdir ruamel.yaml.clib
%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
%changelog
* Tue May 10 2022 Jakub Čajka <jcajka@redhat.com> - 0.2.6-1
- Update to 0.2.6
- Fix for type demotion issues on s390x
- Resolves: BZ#2042422
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (ruamel-yaml-clib-code-955989c1f022b95ca1f92bf0abd761ef8aa0b940.zip) = a2032af5c677c5ebadd8c8289bd0fa926cbb07e0a289d95893dc7f0e38d6387cf3798046727627c6574ede84828054eabf6262b4f5a490072e8902c85c6c6b06
SHA512 (ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e.zip) = 62817e79251c31927fa944d769f214715c0a5a4d99e44f186b92036d0aaa33751866931eb45b6ecf2e653ad295791eb2bc21b688a2e1ce13895dc9a3bb5cddf8