From e5f2c9223f803e2c212c2b2fa254b2299a01691ad0e855018867a4d7ff22d72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Jan 2020 12:48:43 +0000 Subject: [PATCH 1/3] Accepting request 765242 from home:aplanas:branches:devel:languages:python - Temporary disabled of tests test_egg* and test_nspkg1* - Update to version 3.4 * See changelog at https://github.com/pyinstaller/pyinstaller/blob/v3.6/doc/CHANGES.rst - Add %bcond_with python2 OBS-URL: https://build.opensuse.org/request/show/765242 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=4 --- PyInstaller-3.5.tar.gz | 3 --- PyInstaller-3.6.tar.gz | 3 +++ python-PyInstaller.changes | 12 ++++++++++++ python-PyInstaller.spec | 14 ++++++++++---- 4 files changed, 25 insertions(+), 7 deletions(-) delete mode 100644 PyInstaller-3.5.tar.gz create mode 100644 PyInstaller-3.6.tar.gz diff --git a/PyInstaller-3.5.tar.gz b/PyInstaller-3.5.tar.gz deleted file mode 100644 index 9b273d2..0000000 --- a/PyInstaller-3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee7504022d1332a3324250faf2135ea56ac71fdb6309cff8cd235de26b1d0a96 -size 3518991 diff --git a/PyInstaller-3.6.tar.gz b/PyInstaller-3.6.tar.gz new file mode 100644 index 0000000..ccf1f2a --- /dev/null +++ b/PyInstaller-3.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3730fa80d088f8bb7084d32480eb87cbb4ddb64123363763cf8f2a1378c1c4b7 +size 3539593 diff --git a/python-PyInstaller.changes b/python-PyInstaller.changes index fd172e5..2aff4db 100644 --- a/python-PyInstaller.changes +++ b/python-PyInstaller.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 17 10:56:23 UTC 2020 - Alberto Planas Dominguez + +- Temporary disabled of tests test_egg* and test_nspkg1* + +------------------------------------------------------------------- +Thu Jan 16 16:26:53 UTC 2020 - Alberto Planas Dominguez + +- Update to version 3.4 + * See changelog at https://github.com/pyinstaller/pyinstaller/blob/v3.6/doc/CHANGES.rst +- Add %bcond_with python2 + ------------------------------------------------------------------- Mon Sep 23 07:19:49 UTC 2019 - Tomáš Chvátal diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec index 6478e54..e3104b2 100644 --- a/python-PyInstaller.spec +++ b/python-PyInstaller.spec @@ -1,7 +1,7 @@ # # spec file for package python-PyInstaller # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%if 0%{suse_version} > 1500 +%bcond_with python2 +%define skip_python2 1 +%else +%bcond_without python2 +%endif %bcond_without test Name: python-PyInstaller -Version: 3.5 +Version: 3.6 Release: 0 Summary: Bundle a Python application and all its dependencies into a single package License: GPL-2.0-only @@ -57,7 +63,7 @@ BuildRequires: %{python_module setuptools} BuildRequires: python-dis3 BuildRequires: upx %endif -%ifpython2 +%if %{with python2} Requires: python-dis3 %endif %python_subpackages @@ -99,7 +105,7 @@ fi %if %{with test} %check export LANG=en_US.UTF-8 -%pytest_arch tests/unit tests/functional --ignore=tests/functional/test_libraries.py --ignore=tests/functional/test_hooks -k 'not test_find_module' +%pytest_arch tests/unit tests/functional --ignore=tests/functional/test_libraries.py --ignore=tests/functional/test_hooks -k 'not test_find_module and not test_egg and not test_nspkg1' %endif %post From e2b62a84601a974d0a38d3a3123ad1c64d411a3623f28e016dd4c0acacc922c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Jan 2020 12:49:58 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=5 --- python-PyInstaller.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec index e3104b2..51dc13c 100644 --- a/python-PyInstaller.spec +++ b/python-PyInstaller.spec @@ -17,12 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%if 0%{suse_version} > 1500 -%bcond_with python2 -%define skip_python2 1 -%else %bcond_without python2 -%endif %bcond_without test Name: python-PyInstaller Version: 3.6 @@ -60,10 +55,12 @@ BuildRequires: %{python_module pycountry} BuildRequires: %{python_module pytest} BuildRequires: %{python_module qt5} BuildRequires: %{python_module setuptools} +%if %{with python2} BuildRequires: python-dis3 +%endif BuildRequires: upx %endif -%if %{with python2} +%ifpython2 Requires: python-dis3 %endif %python_subpackages From 64fe0fc3e9083d1419509332d4d0e0eb033bc928537ab2201e29816f8bbfc5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Jan 2020 18:10:19 +0000 Subject: [PATCH 3/3] Accepting request 765290 from home:aplanas:branches:devel:languages:python - Requires python-devel, as `pyinstaller` cannot be used without it - Update to version 3.6 OBS-URL: https://build.opensuse.org/request/show/765290 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=6 --- python-PyInstaller.changes | 7 ++++++- python-PyInstaller.spec | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/python-PyInstaller.changes b/python-PyInstaller.changes index 2aff4db..2980129 100644 --- a/python-PyInstaller.changes +++ b/python-PyInstaller.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 17 13:33:04 UTC 2020 - Alberto Planas Dominguez + +- Requires python-devel, as `pyinstaller` cannot be used without it + ------------------------------------------------------------------- Fri Jan 17 10:56:23 UTC 2020 - Alberto Planas Dominguez @@ -6,7 +11,7 @@ Fri Jan 17 10:56:23 UTC 2020 - Alberto Planas Dominguez ------------------------------------------------------------------- Thu Jan 16 16:26:53 UTC 2020 - Alberto Planas Dominguez -- Update to version 3.4 +- Update to version 3.6 * See changelog at https://github.com/pyinstaller/pyinstaller/blob/v3.6/doc/CHANGES.rst - Add %bcond_with python2 diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec index 51dc13c..2fabac5 100644 --- a/python-PyInstaller.spec +++ b/python-PyInstaller.spec @@ -33,6 +33,7 @@ BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: pkgconfig(zlib) +Requires: python-devel Requires: python-macholib >= 1.8 Requires: python-pefile >= 2017.8.1 Requires: python-setuptools