rpms/sugar/devel activities.patch,1.1,1.2 sugar.spec,1.12,1.13

[Marco Pesenti Gritti (mpg)]

Author: mpg

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

Modified Files:
	activities.patch sugar.spec 
Log Message:
Resync with F-9

activities.patch:

Index: activities.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/activities.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- activities.patch	28 Apr 2008 20:26:16 -0000	1.1
+++ activities.patch	28 Apr 2008 21:18:13 -0000	1.2
@@ -15,9 +15,11 @@
  
  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 @@
+diff --git a/service/bundleregistry.py b/service/bundleregistry.py
+index 5b12625..88060c3 100644
+--- a/service/bundleregistry.py
++++ b/service/bundleregistry.py
+@@ -26,13 +26,6 @@ from sugar import env
  
  import config
  
@@ -31,12 +33,12 @@
  def _load_mime_defaults():
      defaults = {}
  
-@@ -184,8 +177,8 @@
+@@ -185,8 +178,8 @@ def get_registry():
  
  _bundle_registry = BundleRegistry()
  
--for path in _get_data_dirs():
--    bundles_path = os.path.join(path, 'activities')
+-for data_dir in _get_data_dirs():
+-    bundles_path = os.path.join(data_dir, 'activities')
 -    _bundle_registry.add_search_path(bundles_path)
 +if os.environ.has_key('SUGAR_ACTIVITIES'):
 +    for path in os.environ['SUGAR_ACTIVITIES'].split(':'):


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sugar.spec	28 Apr 2008 20:26:17 -0000	1.12
+++ sugar.spec	28 Apr 2008 21:18:13 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.79.3
-Release: 2%{?dist}
+Version: 0.79.4
+Release: 1%{?dist}
 URL: http://dev.laptop.org
 Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
 License: GPL/LGPL
@@ -73,6 +73,10 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Apr 28 2008 Marco Pesenti Gritti <mpg at redhat.com> - 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