From d8cf96741db9979e28520699c9bfa584caa24f1d Mon Sep 17 00:00:00 2001
From: dgarcia <>
Date: Mar 05 2023 23:27:39 +0000
Subject: Update python-envisage to version 6.1.1 / rev 10 via SR 1069026


https://build.opensuse.org/request/show/1069026
by user dgarcia + dimstar_suse
- Remove py310-eggs.tar.gz source, it's upstreamed now.
- Update to 6.1.1
  * A trait validation error in the Workbench DefaultActionSet has
    been fixed. This fixes a compatibility issue with Traits 6.4.
    (#485)
  * Initialization of application directories now correctly respects
    the value of self.state_location. (#490)
  * In the test suite, egg generation now uses sys.executable to
    ensure it picks up the correct Python executable. (#499)
  * The version of PySide6 used in test workflows has been restricted.
    (#487)
  * The EDM version used in test workflow has been updated. (#484)
  * Various fixes have been made to the GitHub Actions workflows, for
    compatibility with the newest runners. (#491, #494)
  * Copyright headers have been updated for 2023. (#493)
- 6.1.0
  *

---

diff --git a/.files b/.files
index d24d65b..9005cdb 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 85fa5be..da16caa 100644
--- a/.rev
+++ b/.rev
@@ -72,4 +72,38 @@
     <comment>- add test eggs for python 3.10 build</comment>
     <requestid>948966</requestid>
   </revision>
+  <revision rev="10" vrev="1">
+    <srcmd5>857d5fc8c50e191a43bb6a33ccbdb60c</srcmd5>
+    <version>6.1.1</version>
+    <time>1677878892</time>
+    <user>dimstar_suse</user>
+    <comment>- Remove py310-eggs.tar.gz source, it's upstreamed now.
+- Update to 6.1.1
+  * A trait validation error in the Workbench DefaultActionSet has
+    been fixed. This fixes a compatibility issue with Traits 6.4.
+    (#485)
+  * Initialization of application directories now correctly respects
+    the value of self.state_location. (#490)
+  * In the test suite, egg generation now uses sys.executable to
+    ensure it picks up the correct Python executable. (#499)
+  * The version of PySide6 used in test workflows has been restricted.
+    (#487)
+  * The EDM version used in test workflow has been updated. (#484)
+  * Various fixes have been made to the GitHub Actions workflows, for
+    compatibility with the newest runners. (#491, #494)
+  * Copyright headers have been updated for 2023. (#493)
+- 6.1.0
+  * The Application.user_data directory no longer includes the id
+  * of the application, but instead matches the ETSConfig.user_data. (#467)
+  * The Envisage Application will no longer try to change the
+  * ETSConfig.application_home attribute. (#467)
+  * The PackageResourceProtocol now uses importlib.resources instead
+  * of pkg_resources. (#466)
+  * The IPython-related features of Envisage require ipykernel version &lt; 6 and
+  * IPython version &lt; 8. (#449)
+  * Fix EggPluginManager to use current pkg_resources.working_set. (#444)
+  * Simplify ImportManager by using importlib. (#465)
+  * Update end year in copyright headers. (#458)</comment>
+    <requestid>1069026</requestid>
+  </revision>
 </revisionlist>
diff --git a/envisage-6.0.1.tar.gz b/envisage-6.0.1.tar.gz
deleted file mode 120000
index 2dcfc74..0000000
--- a/envisage-6.0.1.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreieimtbjvi2e66wcn3vzi6ehtdznbtdzdxhzlrrs3kgxt26fqdqrjq
\ No newline at end of file
diff --git a/envisage-6.1.1.tar.gz b/envisage-6.1.1.tar.gz
new file mode 120000
index 0000000..0eee037
--- /dev/null
+++ b/envisage-6.1.1.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafkreihif4khhbejctg32b2m2e5pysvk7vraafqlts5mkgmmupkr4jage4
\ No newline at end of file
diff --git a/py310-eggs.tar.gz b/py310-eggs.tar.gz
deleted file mode 120000
index 7587e48..0000000
--- a/py310-eggs.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreidsi2wtg62bh3ongmrvtrznzfhnuxho7xjzgxbmnurngnt6h3pwtq
\ No newline at end of file
diff --git a/python-envisage.changes b/python-envisage.changes
index 5dd0d7c..6dcc0f6 100644
--- a/python-envisage.changes
+++ b/python-envisage.changes
@@ -1,4 +1,35 @@
 -------------------------------------------------------------------
+Thu Mar  2 18:58:30 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Remove py310-eggs.tar.gz source, it's upstreamed now.
+- Update to 6.1.1
+  * A trait validation error in the Workbench DefaultActionSet has
+    been fixed. This fixes a compatibility issue with Traits 6.4.
+    (#485)
+  * Initialization of application directories now correctly respects
+    the value of self.state_location. (#490)
+  * In the test suite, egg generation now uses sys.executable to
+    ensure it picks up the correct Python executable. (#499)
+  * The version of PySide6 used in test workflows has been restricted.
+    (#487)
+  * The EDM version used in test workflow has been updated. (#484)
+  * Various fixes have been made to the GitHub Actions workflows, for
+    compatibility with the newest runners. (#491, #494)
+  * Copyright headers have been updated for 2023. (#493)
+- 6.1.0
+  * The Application.user_data directory no longer includes the id
+  * of the application, but instead matches the ETSConfig.user_data. (#467)
+  * The Envisage Application will no longer try to change the
+  * ETSConfig.application_home attribute. (#467)
+  * The PackageResourceProtocol now uses importlib.resources instead
+  * of pkg_resources. (#466)
+  * The IPython-related features of Envisage require ipykernel version < 6 and
+  * IPython version < 8. (#449)
+  * Fix EggPluginManager to use current pkg_resources.working_set. (#444)
+  * Simplify ImportManager by using importlib. (#465)
+  * Update end year in copyright headers. (#458)
+
+-------------------------------------------------------------------
 Tue Jan 25 09:08:21 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
 - add test eggs for python 3.10 build 
diff --git a/python-envisage.spec b/python-envisage.spec
index bd43a3c..212a5bf 100644
--- a/python-envisage.spec
+++ b/python-envisage.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-envisage
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +16,11 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define         skip_python2 1
 %define         X_display         ":98"
 %bcond_without     test
 Name:           python-envisage
-Version:        6.0.1
+Version:        6.1.1
 Release:        0
 Summary:        Extensible application framework for Python
 # Source code is under BSD but images are under different licenses
@@ -29,8 +28,6 @@ Summary:        Extensible application framework for Python
 License:        BSD-3-Clause AND Python-2.0 AND LGPL-3.0-only AND CC-BY-SA-1.0 AND CC-BY-SA-2.0 AND CC-BY-SA-2.5 AND CC-BY-SA-3.0 AND SUSE-Public-Domain
 URL:            https://github.com/enthought/envisage
 Source:         https://files.pythonhosted.org/packages/source/e/envisage/envisage-%{version}.tar.gz
-# FIX-UPSTREAM: taken from https://github.com/enthought/envisage/pull/436
-Source1:        py310-eggs.tar.gz
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module traits >= 6.2}
 BuildRequires:  fdupes
@@ -59,7 +56,7 @@ Netbeans frameworks for Java applications.
 Part of the Enthought Tool Suite (ETS).
 
 %prep
-%setup -q -n envisage-%{version} -a 1
+%setup -q -n envisage-%{version}
 
 %build
 %python_build