rpms/sugar/OLPC-4 .cvsignore, 1.21, 1.22 sources, 1.22, 1.23 sugar.spec, 1.29, 1.30
Tomeu Vizoso
tomeu at fedoraproject.org
Wed Nov 12 17:31:11 UTC 2008
- Previous message: rpms/kdepim/F-10 kdepim-4.1.2-akregator-crash-kde164265.patch, NONE, 1.1 kdepim-4.1.2-akregator-revert-showhide-backport.patch, NONE, 1.1 .cvsignore, 1.54, 1.55 kdepim.spec, 1.196, 1.197 sources, 1.63, 1.64
- Next message: rpms/system-config-printer/devel pycups-git-master.patch, NONE, 1.1 system-config-printer.spec, 1.225, 1.226
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tomeu
Update of /cvs/pkgs/rpms/sugar/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv920
Modified Files:
.cvsignore sources sugar.spec
Log Message:
* Wed Nov 12 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.83.2-1
- Update to 0.83.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 25 Sep 2008 19:15:35 -0000 1.21
+++ .cvsignore 12 Nov 2008 17:30:41 -0000 1.22
@@ -1 +1 @@
-sugar-0.82.9.tar.bz2
+sugar-0.83.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 25 Sep 2008 19:15:35 -0000 1.22
+++ sources 12 Nov 2008 17:30:41 -0000 1.23
@@ -1 +1 @@
-71af6b9632f441259e7ea5608db2ae5f sugar-0.82.9.tar.bz2
+9b50cb553b877d755b09a12e8602dc11 sugar-0.83.2.tar.bz2
Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-4/sugar.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sugar.spec 25 Sep 2008 19:15:35 -0000 1.29
+++ sugar.spec 12 Nov 2008 17:30:41 -0000 1.30
@@ -1,9 +1,11 @@
+%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
%define commitid 454def195d
%define alphatag 20080822git%{commitid}
Summary: OLPC desktop environment
Name: sugar
-Version: 0.82.9
+Version: 0.83.2
Release: 1%{?dist}
#Release: 2.%{alphatag}%{?dist}
URL: http://dev.laptop.org
@@ -12,7 +14,7 @@
# git-checkout %{commitid}
#Source0: %{name}-%{version}-git%{commitid}.tar.bz2
Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
-License: GPLv2+
+License: GPL/LGPL
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,10 +24,12 @@
BuildRequires: python
BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel
+BuildRequires: GConf2-devel
Requires: sugar-artwork
Requires: sugar-toolkit
Requires: gnome-python2-libwnck
+Requires: gnome-python2-gconf
Requires: matchbox-window-manager
Requires: python-telepathy
Requires: gstreamer-python
@@ -62,6 +66,23 @@
if (update-mime-database -v &> /dev/null); then
update-mime-database "%{_datadir}/mime" > /dev/null
fi
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || :
+fi
%postun
if (update-mime-database -v &> /dev/null); then
@@ -75,13 +96,15 @@
%defattr(-,root,root,-)
%doc COPYING README
-%config %{_sysconfdir}/dbus-1/system.d/NetworkManagerInfo.conf
+%config %{_sysconfdir}/dbus-1/system.d/nm-user-settings.conf
+%config %{_sysconfdir}/gconf/schemas/sugar.schemas
%dir %{_datadir}/sugar
%{_datadir}/sugar/*
+%{python_sitelib}/*
+
%{_datadir}/xsessions/sugar.desktop
-%{_datadir}/dbus-1/services/*.service
%{_bindir}/*
%exclude %{_bindir}/sugar-emulator
@@ -93,6 +116,9 @@
%{_bindir}/sugar-emulator
%changelog
+* Wed Nov 12 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.83.2-1
+- Update to 0.83.2
+
* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.9-1
- #7969 Accidental searches lead to a "blank" Home screen
- #8662 xo man jumps around while zooming
- Previous message: rpms/kdepim/F-10 kdepim-4.1.2-akregator-crash-kde164265.patch, NONE, 1.1 kdepim-4.1.2-akregator-revert-showhide-backport.patch, NONE, 1.1 .cvsignore, 1.54, 1.55 kdepim.spec, 1.196, 1.197 sources, 1.63, 1.64
- Next message: rpms/system-config-printer/devel pycups-git-master.patch, NONE, 1.1 system-config-printer.spec, 1.225, 1.226
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list