diff --git a/construct-2.10.56.tar.gz b/construct-2.10.56.tar.gz new file mode 100644 index 0000000..16d8d59 Binary files /dev/null and b/construct-2.10.56.tar.gz differ diff --git a/construct-2.5.1.tar.gz b/construct-2.5.1.tar.gz deleted file mode 100644 index 4ac14f4..0000000 Binary files a/construct-2.5.1.tar.gz and /dev/null differ diff --git a/python-construct-2.5.1-relative.patch b/python-construct-2.5.1-relative.patch deleted file mode 100644 index fe59d01..0000000 --- a/python-construct-2.5.1-relative.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/construct/protocols/layer3/ipv6.py b/construct/protocols/layer3/ipv6.py -index 18a0955..fde16ba 100644 ---- a/construct/protocols/layer3/ipv6.py -+++ b/construct/protocols/layer3/ipv6.py -@@ -2,7 +2,7 @@ - Internet Protocol version 6 (TCP/IP protocol stack) - """ - from construct import * --from ipv4 import ProtocolEnum -+from .ipv4 import ProtocolEnum - from binascii import unhexlify - import six - diff --git a/python-construct.spec b/python-construct.spec index 1e6b496..25e7dd4 100644 --- a/python-construct.spec +++ b/python-construct.spec @@ -1,64 +1,76 @@ +%global _empty_manifest_terminate_build 0 Name: python-construct -Version: 2.5.1 -Release: 19 -Summary: A powerful declarative and symmetrical parser and builder for binary data +Version: 2.10.56 +Release: 1 +Summary: A powerful declarative symmetric parser/builder for binary data License: MIT URL: http://construct.readthedocs.org -Source0: https://pypi.python.org/packages/source/c/construct/construct-%{version}.tar.gz - -Patch0000: python-construct-2.5.1-relative.patch - +Source0: https://files.pythonhosted.org/packages/00/e0/71e41b817220333c7c511c3f78d988d69f9b03b5cca2f251a898ad3567a3/construct-2.10.56.tar.gz BuildArch: noarch -BuildRequires: python2-devel python3-devel - %description Construct is a powerful declarative and symmetrical parser and builder for binary data. -Instead of writing imperative code to parse a piece of data, -you declaratively define a data structure that describes your data. - -%package -n python2-construct -Summary: A powerful declarative and symmetrical parser and builder for binary data -Requires: python2-six -%{?python_provide:%python_provide python2-construct} - -%description -n python2-construct -Construct is a powerful declarative and symmetrical parser and builder for binary data. -Instead of writing imperative code to parse a piece of data, -you declaratively define a data structure that describes your data. +Instead of writing imperative code to parse a piece of data, you declaratively define a data structure that describes your data. As this data structure is not code, you can use it in one direction to parse data into Pythonic objects, and in the other direction, to build objects into binary data. %package -n python3-construct -Summary: A powerful declarative and symmetrical parser and builder for binary data -Requires: python3-six - +Summary: A powerful declarative symmetric parser/builder for binary data +Provides: python-construct +BuildRequires: python3-devel +BuildRequires: python3-setuptools %description -n python3-construct Construct is a powerful declarative and symmetrical parser and builder for binary data. -Instead of writing imperative code to parse a piece of data, -you declaratively define a data structure that describes your data. +Instead of writing imperative code to parse a piece of data, you declaratively define a data structure that describes your data. As this data structure is not code, you can use it in one direction to parse data into Pythonic objects, and in the other direction, to build objects into binary data. + +%package help +Summary: Development documents and examples for construct +Provides: python3-construct-doc +%description help +Construct is a powerful declarative and symmetrical parser and builder for binary data. +Instead of writing imperative code to parse a piece of data, you declaratively define a data structure that describes your data. As this data structure is not code, you can use it in one direction to parse data into Pythonic objects, and in the other direction, to build objects into binary data. %prep -%autosetup -n construct-%{version} -p1 +%autosetup -n construct-2.10.56 %build -%{py2_build} -%{py3_build} +%py3_build %install -%{py2_install} -%{py3_install} +%py3_install +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . -%files -n python2-construct -%license LICENSE -%doc README.rst -%{python2_sitelib}/construct -%{python2_sitelib}/construct-%{version}-py?.?.egg-info +%files -n python3-construct -f filelist.lst +%dir %{python3_sitelib}/* -%files -n python3-construct -%license LICENSE -%doc README.rst -%{python3_sitelib}/construct -%{python3_sitelib}/construct-%{version}-py?.?.egg-info +%files help -f doclist.lst +%{_docdir}/* %changelog +* Mon Aug 17 2020 Python_Bot - 2.10.56-1 +- update to 2.10.56 + * Fri Nov 15 2019 openEuler Buildteam - 2.5.1-19 - Package init