--- a/components/desktop/intltool/intltool.p5m	Thu Jul 28 13:27:59 2016 -0700
+++ b/components/desktop/intltool/intltool.p5m	Tue Jul 26 16:52:49 2016 -0700
@@ -49,6 +49,10 @@
 file path=usr/share/man/man8/intltoolize.8
 license COPYING license=GPLv2
 #
+# Prior to s12_99, intltool was part of the developer/gnome/gettext package,
+# so this optional dependency ensures we don't try to install a conflicting
+# version of that package.
+depend type=optional fmri=developer/gnome/[email protected]
 depend type=require fmri=__TBD pkg.debug.depend.file=Parser.pm \
     pkg.debug.depend.path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML \
     pkg.debug.depend.path=usr/perl5/vendor_perl/$(PERLVER)/XML

--- a/components/gnome/gnome-common/gnome-common.p5m	Thu Jul 28 13:27:59 2016 -0700
+++ b/components/gnome/gnome-common/gnome-common.p5m	Tue Jul 26 16:52:49 2016 -0700
@@ -47,6 +47,10 @@
 #
 license COPYING license=GPLv2
 #
+# Prior to s12_99, gnome-common was part of the developer/gnome/gettext package,
+# so this optional dependency ensures we don't try to install a conflicting
+# version of that package.
+depend type=optional fmri=developer/gnome/[email protected]
 # Programs called from gnome-autogen.sh script
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/automake
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/autoreconf