diff --git a/fix-typecasts-s390x.patch b/fix-typecasts-s390x.patch new file mode 100644 index 0000000000000000000000000000000000000000..0a38063f0fc295373bce4d6510380bc7a096d3bb --- /dev/null +++ b/fix-typecasts-s390x.patch @@ -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 = 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 = data + if emitter.dump_unicode == 0: +diff -up ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/yaml.h.s390x ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/yaml.h diff --git a/python-ruamel-yaml-clib.spec b/python-ruamel-yaml-clib.spec index 2605b3013e7395abb59278bb64249366d4ebc653..aa355ec53ac72cbab919add2bbc8e40ea0051e05 100644 --- a/python-ruamel-yaml-clib.spec +++ b/python-ruamel-yaml-clib.spec @@ -1,13 +1,16 @@ %global pypi_name ruamel.yaml.clib %global pname ruamel-yaml-clib +%global hash 85e484db2b7c37107e4edd2ae6fc380877bbc08e Name: python-%{pname} -Version: 0.1.2 -Release: 1 +Version: 0.2.6 +Release: 3 Summary: C version of reader, parser and emitter for ruamel.yaml derived from libyaml License: MIT URL: https://bitbucket.org/ruamel/yaml.clib -Source0: %{pypi_source} +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 libyaml-devel python3-devel python3-setuptools @@ -24,7 +27,7 @@ It is the C based reader/scanner and emitter for ruamel.yaml. %package_help %prep -%autosetup -n %{pypi_name}-%{version} -p1 +%autosetup -n %{pname}-code-%{hash} -p1 %build %py3_build @@ -35,12 +38,23 @@ It is the C based reader/scanner and emitter for ruamel.yaml. %files -n python3-%{pname} %license LICENSE %{python3_sitearch}/_ruamel_yaml.cpython-* -%{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %files help %defattr(-,root,root) %doc README.rst %changelog +* Fri Jun 02 2023 Han Guangyu - 0.2.6-3 +- Remove python3-ruamel-yaml installation dependency to avoid circular + dependency + +* Tue Nov 22 2022 xu_ping - 0.2.6-2 +- Tarball of source code has correct file content,but inconsistent checksum. + Replace tarball with the consistent checksum. + +* Tue Oct 25 2022 xu_ping - 0.2.6-1 +- Update to 0.2.6 + * Mon Mar 2 2020 openEuler Buildteam - 0.1.2-1 - Package init diff --git a/ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e.zip b/ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e.zip new file mode 100644 index 0000000000000000000000000000000000000000..72bec24c8b6dd1a7dbcd2d38a58af6d4bc68b492 Binary files /dev/null and b/ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e.zip differ diff --git a/ruamel.yaml.clib-0.1.2.tar.gz b/ruamel.yaml.clib-0.1.2.tar.gz deleted file mode 100644 index 8d99cc6d7f1e651a1ec84e809ac3048aff8eb174..0000000000000000000000000000000000000000 Binary files a/ruamel.yaml.clib-0.1.2.tar.gz and /dev/null differ