[sugar] - Split out Control Panels to sub packages - Update gnome-keyring patch. RHBZ 862581 - Add patch to

Thu Oct 4 17:40:15 UTC 2012

commit 4c178ffca08827943cccc38af0ba2dcd67903f8e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 4 18:39:55 2012 +0100

    - Split out Control Panels to sub packages
    - Update gnome-keyring patch. RHBZ 862581
    - Add patch to update build dependencies

 sugar-gnomekeyring.patch |   16 +++---
 sugar.spec               |  129 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 127 insertions(+), 18 deletions(-)
---

diff --git a/sugar-gnomekeyring.patch b/sugar-gnomekeyring.patch
index 756ac9a..a06ab12 100644
--- a/sugar-gnomekeyring.patch
+++ b/sugar-gnomekeyring.patch
@@ -1,11 +1,9 @@
-diff --git a/bin/sugar.in b/bin/sugar.in
-index 12098db..df27143 100644
---- a/bin/sugar.in
-+++ b/bin/sugar.in
-@@ -62,6 +62,26 @@ export LANGUAGE="${LANGUAGE:-${LANG}}"
+--- sugar-0.97.5/bin/sugar.in.orig	2012-10-04 18:06:18.266758698 +0100
++++ sugar-0.97.5/bin/sugar.in	2012-10-04 18:07:30.855201076 +0100
+@@ -62,6 +62,26 @@
  # Set Sugar's telepathy accounts directory
  export MC_ACCOUNT_DIR=$HOME/.sugar/$SUGAR_PROFILE/accounts
-
+ 
 +# Check if the keyring exists and create a default
 +# unencrypted keyring (OLPC #10290)
 +keyring_path=$HOME/.gnome2/keyrings
@@ -26,6 +24,6 @@ index 12098db..df27143 100644
 +mv $keyring_path/default.keyring{.tmp,}
 +fi
 +
- # Workaround until gnome-keyring-daemon lets dbus activate it
- # https://bugzilla.gnome.org/show_bug.cgi?id=628302
- if test "$SUGAR_EMULATOR" = "yes" -a "$(type gnome-keyring-daemon)"; then
+ # Source language settings and debug definitions
+ if [ -f ~/.i18n ]; then
+         . ~/.i18n
diff --git a/sugar.spec b/sugar.spec
index 9735be4..56dd31a 100644
--- a/sugar.spec
+++ b/sugar.spec
@@ -3,33 +3,35 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.97.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sugarlabs.org/
 License: GPLv2+
 Group: User Interface/Desktops
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Patch0: sugar-gnomekeyring.patch
+Patch1: sugar-update-deps.patch
 
 BuildRequires: gettext
 BuildRequires: GConf2-devel
-BuildRequires: gtk2-devel
+BuildRequires: gobject-introspection
+BuildRequires: gtk3-devel
+BuildRequires: gtksourceview3-devel
 BuildRequires: intltool
 BuildRequires: perl-XML-Parser
 BuildRequires: pkgconfig
 BuildRequires: python
-BuildRequires: pygtk2-devel
+
+BuildRequires: libtool autoconf automake
 
 Requires: dbus-x11
 Requires: ethtool
 Requires: gnome-keyring-pam
-Requires: gnome-python2-gconf
-Requires: gnome-python2-libwnck
 Requires: gstreamer-plugins-espeak
 Requires: gstreamer-python
 Requires: metacity
 Requires: NetworkManager
 Requires: openssh
-Requires: pygtksourceview
+Requires: gtksourceview3
 Requires: python-telepathy
 Requires: python-xklavier
 Requires: sugar-artwork
@@ -65,11 +67,88 @@ Requires: xorg-x11-utils
 The emulator let's you test and debug sugar. For example it allows you to run 
 multiple instances of sugar. 
 
+%package cp-all
+Summary: All control panel modules 
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-datetime %{name}-frame %{name}-keyboard %{name}-language
+Requires: %{name}-modemconfiguration %{name}-network %{name}-power %{name}-updater
+
+%description cp-all
+This is a meta package to install all Sugar Control Panel modules
+
+%package cp-datetime
+Summary: Sugar Date and Time control panel
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description cp-datetime
+This is the Sugar Date and Time settings control panel
+
+%package cp-frame
+Summary: Sugar Frame control panel
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description cp-frame
+This is the Sugar Frame settings control panel
+
+%package cp-keyboard
+Summary: Sugar Keyboard control panel
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description cp-keyboard
+This is the Sugar Keyboard settings control panel
+
+%package cp-language
+Summary: Sugar Language control panel
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description cp-language
+This is the Sugar Language settings control panel
+
+%package cp-modemconfiguration
+Summary: Sugar Modem configuration control panel
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description cp-modemconfiguration
+This is the Sugar Modem configuration control panel
+
+%package cp-network
+Summary: Sugar Network control panel
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description cp-network
+This is the Sugar Network settings control panel
+
+%package cp-power
+Summary: Sugar Power control panel
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description cp-power
+This is the Sugar Power settings control panel
+
+%package cp-updater
+Summary: Sugar Activity Update control panel
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description cp-updater
+This is the Sugar Activity Updates control panel
+
+
 %prep
 %setup -q
-#%patch0 -p1 -b .keyring
+%patch0 -p1 -b .keyring
+%patch1 -p1 -b .gtk3deps
 
 %build
+autoreconf
 %configure
 make
 
@@ -122,7 +201,6 @@ if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
 fi
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING README
 
 %config %{_sysconfdir}/dbus-1/system.d/nm-user-settings.conf
@@ -138,16 +216,49 @@ fi
 
 %{_bindir}/*
 %exclude %{_bindir}/sugar-emulator
+%dir %{_datadir}/sugar/extensions/cpsection/
+%exclude %{_datadir}/sugar/extensions/cpsection/[b-z]*
+%{_datadir}/sugar/extensions/cpsection/about*
 
 %{_datadir}/mime/packages/sugar.xml
 
 %files emulator
-%defattr(-,root,root,-)
 %{_bindir}/sugar-emulator
 %{_datadir}/applications/sugar-emulator.desktop
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
+%files cp-all
+
+%files cp-datetime
+%{_datadir}/sugar/extensions/cpsection/datetime
+
+%files cp-frame
+%{_datadir}/sugar/extensions/cpsection/frame
+
+%files cp-keyboard
+%{_datadir}/sugar/extensions/cpsection/keyboard
+
+%files cp-language
+%{_datadir}/sugar/extensions/cpsection/language
+
+%files cp-modemconfiguration
+%{_datadir}/sugar/extensions/cpsection/modemconfiguration
+
+%files cp-network
+%{_datadir}/sugar/extensions/cpsection/network
+
+%files cp-power
+%{_datadir}/sugar/extensions/cpsection/power
+
+%files cp-updater
+%{_datadir}/sugar/extensions/cpsection/updater
+
 %changelog
+* Thu Oct  4 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.97.5-2
+- Split out Control Panels to sub packages
+- Update gnome-keyring patch. RHBZ 862581
+- Add patch to update build dependencies
+
 * Thu Sep 27 2012 Daniel Drake <dsd at laptop.org> - 0.97.5-1
 - New development release
 
