# HG changeset patch # User Alan Coopersmith # Date 1479934160 28800 # Node ID f32f075026f4893880bbed485a6cb0a4cc446015 # Parent c648a1b26160f68ee5f199629cef269aa2b5085c 25130814 dbus-python needs optional dependencies on ancestor packages diff -r c648a1b26160 -r f32f075026f4 components/desktop/dbus-python/dbus-python-GENFRAG.p5m --- a/components/desktop/dbus-python/dbus-python-GENFRAG.p5m Tue Nov 22 10:51:59 2016 -0800 +++ b/components/desktop/dbus-python/dbus-python-GENFRAG.p5m Wed Nov 23 12:49:20 2016 -0800 @@ -33,3 +33,9 @@ file path=usr/share/doc/dbus-python/README file path=usr/share/doc/dbus-python/tutorial.txt license COPYING license=MIT + +# Prevent conflicts with packages that used to deliver these files by +# depending on obsolete versions of them. +depend type=optional fmri=SUNWdbus-python26@0.5.11,5.12-5.12.0.0.0.112.0 +depend type=optional \ + fmri=library/python-2/python-dbus-26@1.1.1,5.12-5.12.0.0.0.112.0 diff -r c648a1b26160 -r f32f075026f4 components/desktop/dbus-python/dbus-python-PYVER.p5m --- a/components/desktop/dbus-python/dbus-python-PYVER.p5m Tue Nov 22 10:51:59 2016 -0800 +++ b/components/desktop/dbus-python/dbus-python-PYVER.p5m Wed Nov 23 12:49:20 2016 -0800 @@ -62,3 +62,11 @@ file path=usr/lib/python$(PYVER)/vendor-packages/dbus/service.py file path=usr/lib/python$(PYVER)/vendor-packages/dbus/types.py license COPYING license=MIT + +# force the rename with an optional dependency on the old name +$(PYTHON_2.7_ONLY)depend type=optional \ + fmri=library/python/python-dbus-27@1.2.0,5.12-5.12.0.0.0.113.0 + +# force a dependency on the dbus-python package +depend type=require \ + fmri=library/python/dbus-python@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)