From 5086bfedacb1dce184ca566e9f154b411b8bfb40 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Fri, 19 Nov 2010 18:42:37 +0100
Subject: [PATCH] Fix dependencies for gnome-power-manager

Merging the g-p-m branch with the one adding gnome-settings-daemon
for A11y, a lot of modules were duplicated. Also, gnome-keyring is
not needed, the distro provided one is enough.

https://bugzilla.gnome.org/show_bug.cgi?id=635199
---
 tools/build/gnome-shell-build-setup.sh |  3 ++-
 tools/build/gnome-shell.modules        | 30 --------------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh
index 2cc10138f..8e3e53c9d 100755
--- a/tools/build/gnome-shell-build-setup.sh
+++ b/tools/build/gnome-shell-build-setup.sh
@@ -62,7 +62,7 @@ fi
 # libxklavier, libxml2, ORBit2, pam, python, readline,
 # spidermonkey ({mozilla,firefox,xulrunner}-js), startup-notification,
 # xdamage, icon-naming-utils, upower, libtool-ltdl, libvorbis,
-# libgcrypt, libtasn1
+# libgcrypt, libtasn1, libgnome-keyring
 #
 # Non-devel packages needed by gnome-shell and its deps:
 # glxinfo, gstreamer-plugins-base, gstreamer-plugins-good,
@@ -120,6 +120,7 @@ if test "x$system" = xFedora ; then
     startup-notification-devel xorg-x11-server-Xephyr gnome-terminal zenity
     icon-naming-utils upower-devel libtool-ltdl-devel libvorbis-devel
     libxklavier-devel libgcrypt-devel libtasn1-devel libtasn1-tools
+    libgnome-keyring-devel
     "
 
   if expr $version \>= 14 > /dev/null ; then
diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
index 044c99787..4438f0060 100644
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -191,35 +191,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-keyring">
-    <branch repo="git.gnome.org" module="gnome-keyring"/>
-    <dependencies>
-       <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libnotify">
-    <branch repo="git.gnome.org" module="libnotify"/>
-    <dependencies>
-      <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgnomekbd">
-    <branch repo="git.gnome.org" module="libgnomekbd"/>
-    <dependencies>
-      <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-settings-daemon">
-    <branch repo="git.gnome.org" module="gnome-settings-daemon"/>
-    <dependencies>
-      <dep package="libnotify"/>
-      <dep package="gnome-desktop-3"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-control-center">
     <branch repo="git.gnome.org" module="gnome-control-center"/>
     <dependencies>
@@ -238,7 +209,6 @@
         <dep package="gconf"/>
         <dep package="cairo"/>
         <dep package="libnotify"/>
-        <dep package="gnome-keyring"/>
         <dep package="libcanberra"/>
 	<dep package="gnome-control-center"/>
     </dependencies>