# HG changeset patch
# User Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
# Date 1474920581 25200
# Node ID d3b6a08a1ea224abd1fb24933f50979c6064a6d6
# Parent  93dcf1920c71266c5c2da59cda956466c4b118b4
24737221 pyatspi-27 seems uninstallable

diff -r 93dcf1920c71 -r d3b6a08a1ea2 components/gnome/pyatspi/pyatspi-PYVER.p5m
--- a/components/gnome/pyatspi/pyatspi-PYVER.p5m	Mon Sep 26 16:23:01 2016 -0700
+++ b/components/gnome/pyatspi/pyatspi-PYVER.p5m	Mon Sep 26 13:09:41 2016 -0700
@@ -24,7 +24,7 @@
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python/pyatspi-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/pyatspi2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python API to AT-SPI on D-Bus"
 set name=com.oracle.info.description value="Python API to AT-SPI on D-Bus"
 set name=com.oracle.info.tpno value=$(TPNO)
@@ -65,9 +65,13 @@
 license COPYING.GPL license=GPLv2
 license COPYING license=LGPLv2.1
 
+# force the rename with an optional dependency on the old name
+$(PYTHON_2.7_ONLY)depend type=optional \
+    fmri=library/python/pyatspi-27@2.30.0-5.12.0.0.0.109.0
+
 # force a dependency on the unversioned package
 depend type=require \
-    fmri=library/python/pyatspi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/pyatspi2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
 # force a dependency on the Python runtime
 depend type=require fmri=runtime/python-$(PYV)
diff -r 93dcf1920c71 -r d3b6a08a1ea2 components/meta-packages/history/history
--- a/components/meta-packages/history/history	Mon Sep 26 16:23:01 2016 -0700
+++ b/components/meta-packages/history/history	Mon Sep 26 13:09:41 2016 -0700
@@ -963,7 +963,7 @@
 library/python-2/importlib-26@1.0.2-5.12.0.0.0.86.0
 library/python-2/ordereddict@1.1-5.12.0.0.0.86.0
 library/python-2/ordereddict-26@1.1-5.12.0.0.0.86.0
-library/python-2/pyatspi-26@2.30.0,5.12-5.12.0.0.0.85.0 library/python/pyatspi-27@2.30.0-5.12.0.0.0.85.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/pyatspi-26@2.30.0,5.12-5.12.0.0.0.109.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/pycairo-26@1.8.8,5.12-5.12.0.0.0.85.0 library/python/pycairo-27@1.8.10-5.12.0.0.0.85.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/pygobject-26@2.21.1,5.12-5.12.0.0.0.85.0 library/python/pygobject-27@2.28.6-5.12.0.0.0.85.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/pygtk2-26@2.17.0,5.12-5.12.0.0.0.85.0 library/python/pygtk2-27@2.24.0-5.12.0.0.0.85.0 incorporate=consolidation/desktop/gnome-incorporation
@@ -1009,6 +1009,7 @@
 library/python/importlib-26@1.0.2-5.12.0.0.0.86.0
 library/python/ordereddict@1.1-5.12.0.0.0.86.0
 library/python/ordereddict-26@1.1-5.12.0.0.0.86.0
+library/python/pyatspi-27@2.30.0-5.12.0.0.0.109.0 library/python/pyatspi2-27@2.18.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python/python-compizconfig-27@0.8.4,5.12-5.12.0.0.0.90.0
 library/python/python-gnome-extras-27@2.25.3-5.12.0.0.0.97.0
 library/python/python-gtk-vnc-27@0.3.10-5.12.0.0.0.97.0