diff options
| -rw-r--r-- | config/modulesets/glucose-external.modules | 16 | ||||
| -rw-r--r-- | config/modulesets/glucose.modules | 7 | ||||
| -rw-r--r-- | config/sysdeps/fedora-family.xml | 2 |
3 files changed, 7 insertions, 18 deletions
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules index 665e45e..45f15f0 100644 --- a/config/modulesets/glucose-external.modules +++ b/config/modulesets/glucose-external.modules @@ -24,7 +24,6 @@ <branch repo="git.gnome.org"/> <dependencies> <dep package="glib"/> - <dep package="py2cairo"/> <dep package="gobject-introspection"/> </dependencies> </autotools> @@ -33,24 +32,11 @@ <branch repo="git.gnome.org"/> <dependencies> <dep package="glib"/> - <dep package="cairo"/> </dependencies> </autotools> <autotools id="glib"> <branch repo="git.gnome.org"/> - <dependencies> - <dep package="gtk-doc"/> - </dependencies> - <after> - <dep package="shared-mime-info"/> - </after> - <suggests> - <!-- these provide gnome implementations of glib - extension points --> - <dep package="gvfs"/> - <dep package="glib-networking"/> - </suggests> </autotools> <tarball id="pygobject2" version="2.14"> @@ -92,7 +78,7 @@ <autotools id="hippo-canvas"> <branch repo="git.gnome.org"/> <dependencies> - <dep package="pygobject"/> + <dep package="pygobject2"/> </dependencies> </autotools> <autotools id="telepathy-gabble" diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules index 5488ceb..368b50e 100644 --- a/config/modulesets/glucose.modules +++ b/config/modulesets/glucose.modules @@ -6,13 +6,13 @@ <autotools id="sugar-base"> <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/> <dependencies> - <dep package="pygobject"/> + <dep package="pygobject2"/> </dependencies> </autotools> <autotools id="sugar-toolkit"> <branch module="sugar-toolkit/mainline.git" checkoutdir="sugar-toolkit"/> <dependencies> - <dep package="pygobject"/> + <dep package="pygobject2"/> <dep package="sugar-datastore"/> <dep package="hippo-canvas"/> <dep package="sugar-presence-service"/> @@ -34,6 +34,9 @@ <dep package="sugar-base"/> <dep package="sugar-toolkit"/> <dep package="sugar-artwork"/> + <dep package="pygobject"/> + <dep package="gobject-introspection"/> + <dep package="glib"/> </dependencies> </autotools> <autotools id="sugar-presence-service"> diff --git a/config/sysdeps/fedora-family.xml b/config/sysdeps/fedora-family.xml index 65ff62f..e18fc9a 100644 --- a/config/sysdeps/fedora-family.xml +++ b/config/sysdeps/fedora-family.xml @@ -63,7 +63,7 @@ <package name="popt-devel"/> <package name="pyabiword" source="pyabiword"/> <package name="pygame"/> - <package name="pygobject2" source="pygobject"/> + <package name="pygobject2" source="pygobject2"/> <package name="pygtk2-devel"/> <package name="pygtksourceview"/> <package name="python-BeautifulSoup"/><!-- for Read --> |