rpms/sugar-toolkit/EL-6 .cvsignore, 1.42, 1.43 sources, 1.46, 1.47 sugar-toolkit.spec, 1.60, 1.61

[Sebastian Dziallas]

Author: sdz

Update of /cvs/pkgs/rpms/sugar-toolkit/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13095

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
lets use F-13 files (we want Sugar 0.88 in EL-6)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/EL-6/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	21 Oct 2009 15:07:22 -0000	1.42
+++ .cvsignore	11 Jul 2010 15:22:58 -0000	1.43
@@ -1 +1 @@
-sugar-toolkit-0.86.2.tar.bz2
+sugar-toolkit-0.88.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/EL-6/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	21 Oct 2009 15:07:22 -0000	1.46
+++ sources	11 Jul 2010 15:22:58 -0000	1.47
@@ -1 +1 @@
-d6b5890cf7f4106423ba17917c69c816  sugar-toolkit-0.86.2.tar.bz2
+0774740d4b0263e1eb1e841d5f83a3fa  sugar-toolkit-0.88.1.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/EL-6/sugar-toolkit.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sugar-toolkit.spec	21 Oct 2009 15:07:22 -0000	1.60
+++ sugar-toolkit.spec	11 Jul 2010 15:22:58 -0000	1.61
@@ -1,20 +1,13 @@
-%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-
-%define commitid 0a65259dc5
-%define alphatag 20090401git%{commitid}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.86.2
+Version: 0.88.1
 Release: 1%{?dist}
-#Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
-# git clone git://dev.laptop.org/sugar
-# cd sugar
-# git-checkout %{commitid}
-#Source0: %{name}-%{version}-git%{commitid}.tar.bz2
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
+Patch0: sugar-toolkit-dont-configure-fonts.patch
 License: LGPLv2
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +29,8 @@ Requires: sugar-datastore
 Requires: sugar-base
 Requires: sugar-presence-service
 Requires: python-simplejson
+Requires: python-dateutil
+Requires: unzip
 
 %description
 Sugar is the core of the OLPC Human Interface. The toolkit provides
@@ -44,18 +39,24 @@ to interact with system services like pr
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
-make
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-%find_lang %name
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ 	 
+
+mkdir -p %{buildroot}/%{_sysconfdir}/rpm/ 	 
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.sugar
 
+%find_lang %name
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
 %clean
 rm -rf %{buildroot}
 
@@ -67,16 +68,56 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Thu Jun  3 2010 Peter Robinson <pbrobinson at gmail.com> - 0.88.1-1
+- New upstream stable 0.88.1 release
+
+* Tue Mar 20 2010 Peter Robinson <pbrobinson at gmail.com> - 0.88.0-1
+- New upstream stable 0.88.0 release
+
+* Wed Mar 10 2010 Sebastian Dziallas <sebastian at when.com> - 0.87.8-1
+- New upstream release
+
+* Wed Feb 17 2010 Sebastian Dziallas <sebastian at when.com> - 0.87.6-1
+- New upstream release
+
+* Tue Feb 16 2010 Sebastian Dziallas <sebastian at when.com> - 0.87.5-4
+- Make sure to use correct patch
+
+* Tue Feb 16 2010 Sebastian Dziallas <sebastian at when.com> - 0.87.5-3
+- Enable sugar-settings-manager support
+
+* Sat Feb 13 2010 Simon Schampijer <simon at schampijer.de> - 0.87.5-2
+- Add the requires field for python-dateutil (brings back activity start)
+
+* Thu Feb 11 2010 Sebastian Dziallas <sebastian at when.com> - 0.87.5-1
+- New upstream release
+
+* Sun Feb 07 2010 Sebastian Dziallas <sebastian at when.com> - 0.87.4-1
+- New upstream release
+
+* Tue Jan 12 2010 Sebastian Dziallas <sebastian at when.com> - 0.87.3-1
+- New upstream release
+
+* Sat Jan  9 2010 Peter Robinson <pbrobinson at gmail.com> - 0.87.2-2
+- Updated to the new python sysarch spec file reqs
+
+* Wed Dec 23 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.2-1
+- New upstream release
+
+* Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.87.1-2
+- Remove libtool archives
+
+* Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
+- New upstream release
+
 * Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.2-1
 - Do not stop processing motion-notify-event #1507
 
-* Fri Oct 09 2009 Luke Macken <lmacken at redhat.com> - 0.86.1-2
-- Remove python-json requirement, which is now provided by Python 2.6
+* Tue Oct 13 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.86.0-3
+- Add unzip as a dependency
 
-* Tue Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
-- Do no use random color if metadata color is not valid #1435
-- Shutdown/Reboot fails when multiple users are logged in #246
-- Present windows in non-active process #1423
+* Fri Oct 09 2009 Luke Macken <lmacken at redhat.com> - 0.86.0-2
+- Remove python-json requirement, which is now provided by Python 2.6
 
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
 - New upstream release