rpms/sugar/devel activities.patch,NONE,1.1 sugar.spec,1.11,1.12
Marco Pesenti Gritti (mpg)
fedora-extras-commits at redhat.com
Mon Apr 28 20:27:00 UTC 2008
- Previous message (by thread): rpms/sugar/F-9 activities.patch,NONE,1.1 sugar.spec,1.10,1.11
- Next message (by thread): rpms/ipa/F-9 freeipa-dnsquery.patch, NONE, 1.1 freeipa-nssperms.patch, NONE, 1.1 ipa.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mpg
Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18191
Modified Files:
sugar.spec
Added Files:
activities.patch
Log Message:
* Mon Apr 28 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.79.3-2
- Patch to fix system activities location
activities.patch:
--- NEW FILE activities.patch ---
diff --git a/bin/sugar-shell-service.in b/bin/sugar-shell-service.in
index e88ea65..49c2764 100644
--- a/bin/sugar-shell-service.in
+++ b/bin/sugar-shell-service.in
@@ -16,6 +16,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import sys
+from os import environ
+
+if not environ.has_key('SUGAR_ACTIVITIES'):
+ environ['SUGAR_ACTIVITIES'] = '@prefix@/share/sugar/activities:' \
+ '@prefix@/lib64/sugar/activities:' \
+ '@prefix@/lib/sugar/activities'
sys.path.insert(0, '@prefix@/share/sugar/service')
--- sugar-0.79.3/service/bundleregistry.py.activities 2008-04-08 18:30:16.000000000 +0200
+++ sugar-0.79.3/service/bundleregistry.py 2008-04-28 22:01:24.000000000 +0200
@@ -27,13 +27,6 @@
import config
-# http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
-def _get_data_dirs():
- if os.environ.has_key('XDG_DATA_DIRS'):
- return os.environ['XDG_DATA_DIRS'].split(':')
- else:
- return [ '/usr/local/share/', '/usr/share/' ]
-
def _load_mime_defaults():
defaults = {}
@@ -184,8 +177,8 @@
_bundle_registry = BundleRegistry()
-for path in _get_data_dirs():
- bundles_path = os.path.join(path, 'activities')
- _bundle_registry.add_search_path(bundles_path)
+if os.environ.has_key('SUGAR_ACTIVITIES'):
+ for path in os.environ['SUGAR_ACTIVITIES'].split(':'):
+ _bundle_registry.add_search_path(path)
_bundle_registry.add_search_path(env.get_user_activities_path())
Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sugar.spec 22 Apr 2008 17:15:29 -0000 1.11
+++ sugar.spec 28 Apr 2008 20:26:17 -0000 1.12
@@ -1,7 +1,7 @@
Summary: OLPC desktop environment
Name: sugar
-Version: 0.79.4
-Release: 1%{?dist}
+Version: 0.79.3
+Release: 2%{?dist}
URL: http://dev.laptop.org
Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
License: GPL/LGPL
@@ -21,6 +21,8 @@
Requires: matchbox-window-manager
Requires: numpy
+Patch1: activities.patch
+
%description
Desktop Environment for the One Laptop Per Child project; see the
@@ -30,6 +32,8 @@
%prep
%setup -q
+%patch1 -p1 -b .activities
+
%build
%configure
make
@@ -69,9 +73,8 @@
%{_datadir}/mime/packages/sugar.xml
%changelog
-* Tue Apr 22 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.79.4-1
-- Pylint cleanup.
-- Misc graphical fixes.
+* Mon Apr 28 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.79.3-2
+- Patch to fix system activities location
* Wed Apr 09 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.79.3-1
- Misc graphical fixes.
- Previous message (by thread): rpms/sugar/F-9 activities.patch,NONE,1.1 sugar.spec,1.10,1.11
- Next message (by thread): rpms/ipa/F-9 freeipa-dnsquery.patch, NONE, 1.1 freeipa-nssperms.patch, NONE, 1.1 ipa.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list