From 26c6afde9af3b64f9e09d253ed2ad813dfb4cde7773830f946be5f6683fda90e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 17 Jan 2020 12:48:43 +0000
Subject: [PATCH] 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 <aplanas@suse.com>
+
+- Temporary disabled of tests test_egg* and test_nspkg1*
+
+-------------------------------------------------------------------
+Thu Jan 16 16:26:53 UTC 2020 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- 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 <tchvatal@suse.com>
 
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