From 73e11fbdf2d161e047c071f2e68c641a1e077425 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: May 05 2019 22:32:05 +0000
Subject: Update to 4.7.2


---

diff --git a/130.patch b/130.patch
deleted file mode 100644
index cb4fd48..0000000
--- a/130.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 227d95901c455a76adf1b4ced3bee85100a3cab8 Mon Sep 17 00:00:00 2001
-From: Poruri Sai Rahul <rporuri@enthought.com>
-Date: Sun, 3 Feb 2019 14:06:17 +0530
-Subject: [PATCH] FIX : update broken imports and usage
-
-	modified:   envisage/developer/charm/charm.py
-	modified:   envisage/developer/ui/view/plugin_browser.py
-	modified:   envisage/ui/single_project/view/project_view.py
----
- envisage/developer/charm/charm.py               | 2 +-
- envisage/developer/ui/view/plugin_browser.py    | 6 +++---
- envisage/ui/single_project/view/project_view.py | 3 +--
- 3 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/envisage/developer/charm/charm.py b/envisage/developer/charm/charm.py
-index 174f62f..d943c57 100644
---- a/envisage/developer/charm/charm.py
-+++ b/envisage/developer/charm/charm.py
-@@ -2,7 +2,7 @@
- 
- 
- # Enthought library imports.
--from envisage.developer.api import CodeBrowser, Module
-+from envisage.developer.code_browser.api import CodeBrowser, Module
- from traits.api import Event, HasTraits, Instance, Str
- 
- 
-diff --git a/envisage/developer/ui/view/plugin_browser.py b/envisage/developer/ui/view/plugin_browser.py
-index 671b0cf..1589263 100644
---- a/envisage/developer/ui/view/plugin_browser.py
-+++ b/envisage/developer/ui/view/plugin_browser.py
-@@ -2,13 +2,13 @@
- 
- 
- # Enthought library imports.
--from envisage.api import ExtensionPoint, IPlugin
-+from envisage.api import ExtensionPoint, IApplication, IExtensionPoint, IPlugin
- from traits.api import Delegate, HasTraits, Instance, List, Property
- from traits.api import Code, Str
- from traitsui.api import Item, TableEditor, View, VGroup
- from traitsui.table_column import ObjectColumn # fixme: non-api!
- 
--class ExtensionPointModel(Hastraits):
-+class ExtensionPointModel(HasTraits):
-     """ A model for browsing an extension point. """
- 
-     # The plugin that offered the extension point.
-@@ -21,7 +21,7 @@ class ExtensionPointModel(Hastraits):
- 
- 
- 
--class ExtensionModel(Hastraits):
-+class ExtensionModel(HasTraits):
-     """ A model for browsing a contribution to an extension point. """
- 
-     # The plugin that made the contribution.
-diff --git a/envisage/ui/single_project/view/project_view.py b/envisage/ui/single_project/view/project_view.py
-index 5aed419..0e93a34 100644
---- a/envisage/ui/single_project/view/project_view.py
-+++ b/envisage/ui/single_project/view/project_view.py
-@@ -12,7 +12,6 @@
- 
- # Standard library imports.
- import logging
--from string import rfind
- 
- # Enthought library imports
- from apptools.naming.api import Binding
-@@ -262,7 +261,7 @@ def _name_suffix_changed(self, old, new):
-         # on the new suffix, if any.
-         name = self.name
-         if old is not None and len(old) > 0:
--            index = rfind(name, " " + old)
-+            index = (" " + old).rfind(name)
-             if index > -1:
-                 name = name[0:index]
-         if new is not None and len(new) > 0:
diff --git a/python-envisage.spec b/python-envisage.spec
index 3d6fcd3..2146f39 100644
--- a/python-envisage.spec
+++ b/python-envisage.spec
@@ -1,8 +1,10 @@
 %global srcname envisage
+#global commit 872c66885d64a22502fe3efceecec99c11a1c8ff
+#global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           python-%{srcname}
-Version:        4.7.1
-Release:        2%{?dist}
+Version:        4.7.2
+Release:        1%{?dist}
 Summary:        Extensible application framework
 
 # Images have different licenses. For image license breakdown check
@@ -10,9 +12,7 @@ Summary:        Extensible application framework
 # All remaining source or image files are in BSD 3-clause license
 License:        BSD and LGPLv2 and CC-BY-SA
 URL:            https://github.com/enthought/envisage
-Source0:        https://github.com/enthought/%{srcname}/archive/%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
-# Fix python setup.py test
-Patch0:         https://patch-diff.githubusercontent.com/raw/enthought/envisage/pull/130.patch
+Source0:        https://github.com/enthought/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildArch:      noarch
 # For docs
@@ -112,8 +112,7 @@ find %{buildroot}%{python3_sitelib}/%{srcname} -name tests -type d -exec rm -r {
 %check
 # This finds and runs more (broken) tests
 #xvfb-run %{__python3} setup.py test
-# Missing 3.7 eggs - https://github.com/enthought/envisage/issues/135
-xvfb-run %{__python3} -m nose.core envisage || :
+xvfb-run %{__python3} -m nose.core envisage
 
  
 %files -n python%{python3_pkgversion}-%{srcname}
@@ -128,6 +127,9 @@ xvfb-run %{__python3} -m nose.core envisage || :
 
 
 %changelog
+* Sun May 5 2019 Orion Poplawski <orion@nwra.com> - 4.7.2-1
+- Update to 4.7.2
+
 * Sat Feb 9 2019 Orion Poplawski <orion@nwra.com> - 4.7.1-2
 - Run tests with nose like upstream
 - Add upstream patch to fix some tests