rpms/sugar/devel sugar-0.65-jabberserver.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sugar.spec, 1.1, 1.2

[Marco Pesenti Gritti (mpg)]

Author: mpg

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27345

Modified Files:
	.cvsignore sources sugar.spec 
Added Files:
	sugar-0.65-jabberserver.patch 
Log Message:
Import from OLPC-2

sugar-0.65-jabberserver.patch:

--- NEW FILE sugar-0.65-jabberserver.patch ---
--- sugar-0.65/lib/sugar/profile.py.old	2007-09-24 22:35:48.000000000 +0200
+++ sugar-0.65/lib/sugar/profile.py	2007-09-24 22:36:05.000000000 +0200
@@ -24,7 +24,7 @@
 from sugar import util
 from sugar.graphics.xocolor import XoColor
 
-DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk'
+DEFAULT_JABBER_SERVER = 'ship2.jabber.laptop.org'
 DEFAULT_VOLUME = 81
 
 _profile = None


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jun 2007 08:52:02 -0000	1.2
+++ .cvsignore	6 Dec 2007 00:07:18 -0000	1.3
@@ -1 +1 @@
-sugar-0.65-git0e4efae7ae.tar.bz2
+sugar-0.75.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jun 2007 08:52:02 -0000	1.2
+++ sources	6 Dec 2007 00:07:18 -0000	1.3
@@ -1 +1 @@
-524f26bb3853c1b690bd4d468b2c294d  sugar-0.65-git0e4efae7ae.tar.bz2
+5c14b6de5e84aa23b6dbcbfcde5cd49f  sugar-0.75.0.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sugar.spec	21 Jun 2007 08:52:02 -0000	1.1
+++ sugar.spec	6 Dec 2007 00:07:18 -0000	1.2
@@ -1,27 +1,25 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070620git
-%define commitid 0e4efae7ae
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.65
-Release: 0.1.%{alphatag}%{commitid}
-URL: http://dev.laptop.org/
-# OLPC is upstream, RPM is canonical source for packaged code.
-# git clone git://dev.laptop.org/sugar
-# cd sugar
-# git-checkout %{commitid}
-Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+Version: 0.75.0
+Release: 1%{?dist} 
+URL: http://dev.laptop.org
+Source0: http://dev.laptop.org/pub/sugar/release/%{name}-%{version}.tar.bz2
 License: GPL/LGPL
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: sugar-0.65-jabberserver.patch
+
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
 BuildRequires: gstreamer-devel
 BuildRequires: gtk2-devel
+BuildRequires: dbus-devel
+BuildRequires: python
 
 Requires: gnome-python2-rsvg
 Requires: gnome-python2-libwnck
@@ -33,9 +31,11 @@
 Requires: hippo-canvas-python
 Requires: matchbox-window-manager
 Requires: vte
+Requires: sugar-artwork
 Requires: sugar-datastore
+Requires: sugar-base
 Requires: sugar-presence-service
-Requires: telepathy-python
+Requires: python-telepathy
 Requires: telepathy-gabble
 Requires: telepathy-glib
 
@@ -48,6 +48,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .jabberserver
+
 %build
 %configure
 make
@@ -75,8 +77,321 @@
 
 %{_bindir}/*
 
+%{_datadir}/mime/packages/sugar.xml
+
 %changelog
-* Wed Jun 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.1.20070620git0e4efae7ae
+* Wed Dec  5 2007 Marco Pesenti Gritti <marco at localhost.localdomain> - 0.75.0-1
+- Update to 0.75.0
+
+* Fri Nov 30 2007 Marco Pesenti Gritti <marco at localhost.localdomain> - 0.70.3-1
+- Update to 0.70.3
+
+* Thu Nov 29 2007 Marco Pesenti Gritti <marco at localhost.localdomain> - 0.70.2-2
+- Change the jabber server
+
+* Tue Nov 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.70.2-1
+- Update to 0.70.2
+
+* Mon Nov 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.70.1-1
+- Update to 0.70.1
+
+* Wed Nov 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.89.20071114git411879e9de
+- #4768 Fix memory leak when switching between activities. (marco)
+
+* Tue Nov 13 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.88.20071113git9d28557bbd
+- Fix randr. (marco)
+- Do not fail if there is not an activity service. (marco)
+- Alert when an activity cannot be saved. (rwh)
+
+* Tue Nov 13 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.87.20071113git47e231311b
+- Get rid of sound competely to be sure we don't block the device. (marco)
+
+* Tue Nov 13 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.86.20071112git1bf6cdaa81
+- #4728, #4764: Set the correct colors for filtered out mesh view icons. (tomeu)
+
+* Fri Nov 09 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.85.20071109gitd6bac927e1
+- #4667 Do not display XO outside the mesh view. (marco)
+- #4687 Use the right free function, fix a crash. (sjoerd)
+- #4724 Display meshbox invite palette menu with colored
+  activity icon (erikos)
+- Always checkin to the DS from a new file. (tomeu)
+
+* Fri Nov 09 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.84.20071109git55864fa3f6
+- Support for the espeak service. (codyl)
+- Fix typo in activity launching code. (marco)
+
+* Thu Nov 08 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.83.20071108gite23f012e08
+- Launch a few activities outside rainbow containers. (marco)
+
+* Thu Nov 08 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.82.20071108git3e491c2dc7
+- #4715: Filter new items that appear in the mesh view. (tomeu)
+- #4716: Filter correctly activity icons in the mesh view. (tomeu)
+- Use HOME/.i18n in control panel and reset jabber_registered to False (erikos)
+
+* Wed Nov 07 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.81.20071107gitdae3ebe8d1
+Snapshot 306d32832f
+
+* Tue Nov  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.80.20071106git306d32832f
+- Add missing dependency to sugar-base
+
+* Tue Nov 06 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.79.20071106git306d32832f
+- Associate ctrl+s to keep. (rwh)
+
+* Tue Nov 06 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.78.20071105git73cae198f5
+- Remove the startup sound for now, to not break audio
+  for all the activities. (marco)
+
+* Mon Nov 05 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.77.20071105git0a9676171d
+- #4650: Failure to write journal files. (marco)
+
+* Mon Nov 05 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.76.20071105gitee8712d1c4
+- #3119: Implement some basic search capabilities in the mesh view. (tomeu)
+
+* Sun Nov 04 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.75.20071104gitd456f6c633
+- New experimental screenshot code. (marco)
+
+* Sat Nov 03 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.74.20071103gite748f756c0
+- #4618: Make the shell service more resilient to failure. (tomeu)
+
+* Fri Nov 02 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.73.20071102git39aca0154d
+- Get bundle installation to work again. (marco)
+
+* Fri Nov 02 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.72.20071102gitb6422678e6
+- #1941 Call FocusSearch method for popping up the journal. (rwh)
+
+* Fri Oct 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.71.20071019gitefd0bbd326
+- New snapshot
+
+* Thu Oct 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.70.20071018git78f51a1b56
+- New snapshot
+
+* Thu Oct 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.69.20071010git9c5755d85a
+- New snapshot
+
+* Tue Oct  9 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.68.20071009git6c7c6a503b
+- New snapshot
+
+* Sun Oct  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.67.20071007git143f9ac9c6
+- New snapshot
+
+* Sun Oct  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.66.20071007git143f9ac9c6
+- New snapshot
+
+* Sat Oct  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.65.20071006gitc74013db1f
+- New snapshot
+
+* Sat Oct  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.64.20071005git79ba6b91b7
+- New snapshot
+
+* Thu Oct  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.63.20071004gitacca55e861
+- New snapshot
+
+* Mon Oct  1 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.61.20071001gited40d65791
+- New snapshot
+
+* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.60.20070928gitb8ec83c5b8
+- New snapshot
+
+* Wed Sep 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.59.20070926git5a595ea04e
+- New snapshot
+
+* Tue Sep 25 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.58.20070925git5a595ea04e
+- New snapshot
+
+* Mon Sep 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.57.20070924git5a595ea04e
+- New snapshot
+
+* Sat Sep 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.56.20070922git5a595ea04e
+- New snapshot
+
+* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.55.20070920git5a595ea04e
+- New snapshot
+
+* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.54.20070919gitb8ce5083b7
+- New snapshot
+
+* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.53.20070919gitb8ce5083b7
+- New snapshot
+
+* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.52.20070918gitb8ce5083b7
+- New snapshot
+
+* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.51.20070917gitb8ce5083b7
+- New snapshot
+- Add a patch to set the jabber server to jabber.laptop.org
+
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.50.20070917gited22733941
+- New snapshot
+
+* Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
+- New snapshot
+
+* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.48.20070914git0a666e23cf
+- New snapshot
+
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.47.20070912git47f473189e
+- New snapshot
+
+* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.46.20070911git8b784a6223
+- New snapshot
+
+* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.45.20070910git79237f3114
+- New snapshot
+
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.44.20070909gita1f5cece18
+- New snapshot
+
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.43.20070909git6b6470ebcb
+- New snapshot
+
+* Fri Sep  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.42.20070907gitc8700feccf
+- New snapshot
+
+* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.41.20070906gitd9a30c23ff
+- New snapshot
+
+* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.40.20070904git0ad6398cf1
+- New snapshot
+
+* Mon Sep  3 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.39.20070903git0b3f687749
+- New snapshot
+
+* Sat Sep  1 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.34.20070901gitfeb462d08d
+- New snapshot
+
+* Thu Aug 30 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.33.20070830gite65fef5c79
+- New snapshot
+
+* Wed Aug 29 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.32.20070829git23ad88db0c
+- New snapshot
+
+* Tue Aug 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.30.20070827git246ec1e4aa
+- New snapshot
+
+* Wed Aug 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.29.20070822gitd38cacfe2c
+- New snapshot
+
+* Mon Aug 20 2007 John (J5) Palmieri <mpg at redhat.com> - 0.65-0.28.20070820gite83b98a8f6
+- New snapshot
+
+* Mon Aug 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.28.20070820gitb24a28a77d
+- New snapshot
+
+* Tue Aug 14 2007 John (J5) Palmieri <johnp at redhat.com> - 0.65-0.27.20070814gitd93122bf5e
+- New snapshot
+
+* Wed Aug  1 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.27.20070801gitd22f00d894
+- New snapshot
+    * Don't set a presence server by default (except in the emulator) (dcbw)
+
+* Tue Jul 31 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.26.20070731git7ddd46589e
+- New snapshot
+
+* Sun Jul 29 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.25.20070729git285099fe08
+- New snapshot
+
+* Fri Jul 27 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.24.20070727git285099fe08
+- New snapshot
+
+* Wed Jul 25 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.23.20070725git088c7612e3
+- New snapshot
+
+* Tue Jul 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.22.20070724git9ac5d38e90
+- New snapshot
+
+* Mon Jul 23 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.21.20070723git4a924a8e5d
+- New snapshot
+
+* Mon Jul 23 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.20.20070723git943c78ffa7
+- New snapshot
+
+* Fri Jul 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.19.20070720git8ae99aaa87
+- New snapshot
+
+* Thu Jul 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.18.20070719gitf6f3f2b520
+- New snapshot
+
+* Tue Jul 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.16.20070717git5212790236
+- New snapshot
+
+* Tue Jul 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.15.20070716gitfd7336c2f1
+- New snapshot
+
+* Mon Jul 16 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.14.20070715git9f4da4e6d1
+- New snapshot
+
+* Fri Jul 13 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.13.20070713git4c352d1f83
+- New snapshot
+
+* Wed Jul 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.12.20070711gitec7eb2ebbb
+- New snapshot
+
+* Tue Jul 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.11.20070710gitb83a9ec27d
+- New snapshot
+
+* Tue Jul 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.4.20070710git42f0bcc48d
+- New snapshot
+
+* Tue Jul 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.3.20070710git757b2b8ce6
+- New snapshot
+
+* Mon Jul  9 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.2.20070709gitaa6a024368
+- New snapshot
+
+* Sun Jul  8 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.10.20070708gitf8cf7ff1ce
+- New snapshot
+
+* Fri Jul  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.9.20070706gitcebf25739b
+- #1930: Only take preview before closing. (tomeu)
+
+* Fri Jul  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.7.20070706git8af15d4e73
+- Nicer tooltips. Improved sizing logic. (marco)
+- Do not popdown the frame when palettes are active. (marco)
+- Add macedonian translation. (ArangelAngov)
+- Add brazilian translation. (DiegoZacarao)
+- Some fixes for changing the selected clipboard object. (tomeu)
+- Fix palettes around the mesh edges. (edsiper)
+
+* Fri Jul  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.6.20070706gitde8b3b4c01
+- Use HAL to get battery informations.
+- Improvements in the mesh view layout.
+- Hide the active palette when another popup.
+- Icons in the buddy menu items
+
+* Tue Jul  3 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.4.20070703gitcc2b8884c0
+- Use the new palette widget everywhere in the UI
+- Do not always show the shutdown palette on startup
+- Implement primary and secondary state for palettes
+- Fix several frame/zoom level bugs 
+
+* Fri Jun 29 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.3.20070629git30bee7e43a
+- Better palette positioning
+- Reject invalid nick names in the intro screen
+- Make startup notification work from the journal and clipboard
+- Do not create a new object when resuming from the journal
+
+* Thu Jun 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.2.20070628git0d6760b194
+- New snapshot
+
+* Thu Jun 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.10.20070628git03ef9c034e
+- New snapshot
+
+* Wed Jun 27 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.9.20070627git381df08442
+- New snapshot
+
+* Wed Jun 27 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.8.20070627git69ba74ddc2
+- New snapshot
+
+* Tue Jun 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.7.20070626git4f748dba9b
+- New snapshot
+
+* Tue Jun 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.4.20070626gitgit84127380dc
+- New snapshot
+
+* Thu Jun 21 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.3.20070620git0e4efae7ae
+- python-telepathy is the name of the package in Fedora
+
+* Wed Jun 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.2.20070620git0e4efae7ae
 - Update to 0.65
 - Fix versioning scheme