gtk2:fixed

desktop/toolkit/gtk/gtk2/actions.py

@@ -21,8 +21,8 @@ def setup():
 
     if get.buildTYPE() == "emul32":
         options += " --libdir=/usr/lib32 \
-                     --bindir=/emul32/bin \
-                     --sbindir=/emul32/sbin \
+                     --bindir=/usr/bin32 \
+                     --sbindir=/usr/sbin32 \
                      --disable-cups"
 
         shelltools.export("CC", "%s -m32" % get.CC())
@@ -49,7 +49,7 @@ def install():
 
     if get.buildTYPE() == "emul32":
         for binaries in ["gtk-query-immodules-2.0", "gtk-demo"]:
-            pisitools.domove("/emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
-        pisitools.removeDir("/emul32")
+            pisitools.domove("/usr/bin32/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
+        pisitools.removeDir("/usr/bin32")
         #hack to install gdkconfig.h in gdk headers dir
         pisitools.dosym("/usr/lib/gtk-2.0/include/gdkconfig.h","/usr/include/gtk-2.0/gdk/gdkconfig.h")

desktop/toolkit/gtk/gtk2/pspec.xml

@@ -13,7 +13,7 @@
         <Description>GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites.</Description>
         <Archive sha1sum="f3c2f1a3728ed51d08054f6b4c7384fbf99477c0" type="tarxz">mirrors://gnome/gtk+/2.24/gtk+-2.24.28.tar.xz</Archive>
         <BuildDependencies>
-        <!--<Dependency>cups-devel</Dependency> --><!--It was disabled to avoid circle-->
+            <Dependency>cups-devel</Dependency><!--It was disabled to avoid circle-->
             <Dependency>libXi-devel</Dependency>
             <Dependency>cairo-devel</Dependency>
             <Dependency>libXext-devel</Dependency>
@@ -46,7 +46,6 @@
     <Package>
         <Name>gtk2</Name>
         <RuntimeDependencies>
-            <Dependency>cups</Dependency>
             <Dependency>libXi</Dependency>
             <Dependency>cairo</Dependency>
             <Dependency>libXext</Dependency>