diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py index 6e3fae81e6..65194ceeca 100644 --- a/desktop/toolkit/gtk/gtk3/actions.py +++ b/desktop/toolkit/gtk/gtk3/actions.py @@ -25,8 +25,8 @@ def setup(): if get.buildTYPE() == "emul32": options += " --libdir=/usr/lib32 \ - --bindir=/emul32/bin \ - --sbindir=/emul32/sbin \ + --bindir=/usr/bin32 \ + --sbindir=/usr/sbin32 \ --enable-colord=no \ " @@ -54,8 +54,8 @@ def install(): pisitools.removeDir("/usr/share/man") pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*") - if get.buildTYPE() == "_emul32": + if get.buildTYPE() == "emul32": for binaries in ["gtk-query-immodules-3.0"]: - pisitools.domove("/emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries) - pisitools.removeDir("/emul32") + pisitools.domove("/usr/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries) + pisitools.removeDir("/usr/bin32") pisitools.rename("/usr/bin/gtk-update-icon-cache", "gtk3-update-icon-cache") diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml index 39a82cc6d0..d1f1fc0a59 100644 --- a/desktop/toolkit/gtk/gtk3/pspec.xml +++ b/desktop/toolkit/gtk/gtk3/pspec.xml @@ -49,7 +49,6 @@ libX11 libepoxy atk - cups pango libXi