rpms/sugar/OLPC-2 .cvsignore, 1.104, 1.105 sources, 1.113, 1.114 sugar.spec, 1.133, 1.134

[Tomeu Vizoso (tomeu)]

Author: tomeu

Update of /cvs/pkgs/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15820

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue May 20 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.75.15-1
- Fix #3486 #3611 #5904




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	18 May 2008 18:34:16 -0000	1.104
+++ .cvsignore	20 May 2008 15:53:27 -0000	1.105
@@ -1 +1 @@
-sugar-0.79.5.tar.bz2
+sugar-0.75.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- sources	18 May 2008 18:34:16 -0000	1.113
+++ sources	20 May 2008 15:53:27 -0000	1.114
@@ -1 +1 @@
-daf83fc949d74a21213ee072df523f3e  sugar-0.79.5.tar.bz2
+21c71f6a404d8fdc37594739b4c56cc7  sugar-0.75.15.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- sugar.spec	18 May 2008 18:34:16 -0000	1.133
+++ sugar.spec	20 May 2008 15:53:27 -0000	1.134
@@ -1,6 +1,8 @@
+%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.79.5
+Version: 0.75.15
 Release: 1%{?dist}
 URL: http://dev.laptop.org
 Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
@@ -8,18 +10,34 @@
 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: python
-BuildRequires: pygtk2-devel
+BuildRequires: gstreamer-devel
 BuildRequires: gtk2-devel
+BuildRequires: dbus-devel
+BuildRequires: python
 
-Requires: sugar-artwork
-Requires: sugar-toolkit
+Requires: gnome-python2-rsvg
 Requires: gnome-python2-libwnck
+Requires: pygtk2
+Requires: dbus-python
+Requires: dbus
+Requires: libxml2-python
+Requires: avahi-tools
+Requires: hippo-canvas-python
 Requires: matchbox-window-manager
-Requires: numpy
+Requires: vte
+Requires: sugar-artwork
+Requires: sugar-datastore
+Requires: sugar-base
+Requires: sugar-presence-service
+Requires: python-telepathy
+Requires: telepathy-gabble
+Requires: telepathy-glib
 
 %description
 
@@ -30,6 +48,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .jabberserver
+
 %build
 %configure
 make
@@ -54,14 +74,15 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING COPYING.LIB README
 
 %config %{_sysconfdir}/dbus-1/system.d/NetworkManagerInfo.conf
 
+%{python_sitelib}/*
+
 %dir %{_datadir}/sugar
 %{_datadir}/sugar/*
 
-%{_datadir}/xsessions/sugar.desktop
 %{_datadir}/dbus-1/services/*.service
 
 %{_bindir}/*
@@ -69,31 +90,17 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
-* Sun May 18 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.79.5-1
-- More pylint cleanup.
-- Misc fixes.
-
-* Tue Apr 22 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.79.4-1
-- Pylint cleanup.
-- Misc graphical fixes.
-
-* Wed Apr 09 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.79.3-1
-- Misc graphical fixes.
+* Tue May 20 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.75.15-1
+- Fix #3486 #3611 #5904
 
-* Wed Apr  2 2008 Simon Schampijer <simon at laptop.org> - 0.79.2-1
-- Frame/Home redesign - Put corner stone
+* Wed Mar 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.75.14-1
+- Fix #6671 #5933 #6405
 
-* Fri Mar 28 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.79.1-1
-- Update to 0.79.1
+* Tue Feb 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.75.13-1
+- Updated translations
 
-* Mon Feb 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.79.0-2
-- Require sugar-artwork
-
-* Fri Feb  8 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.79.0-1
-- Update to 0.79.0, rework dependencies because of the toolkit split
-
-* Sat Feb  2 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.75.11-2
-- Rebuild
+* Sat Feb  9 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.75.12-1
+- Revert fix for #5904 (not approved). Fix #6332.
 
 * Tue Jan 29 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.75.11-1
 - Fix #5904