--- a/ChangeLog	Tue Jul 21 06:09:03 2009 +0000
+++ b/ChangeLog	Tue Jul 21 10:06:28 2009 +0000
@@ -1,3 +1,15 @@
+2009-07 21 Brian Cameron  <[email protected]>
+
+	* base-specs/moovida.spec, patches/moovida-01-g11n-localedir.diff,
+	  patches/moovida-04-fixlocale.diff, patches/moovida-05-pidof.diff:
+	  Merge patch 1 and 4.  Add patch moovida-05-pidof.diff to fix bug
+	  #400134.
+	* base-specs/moovida-plugins-good.spec: Update patch comment.
+	* patches/moovida-plugins-good-02-solaris.diff: No longer mark
+	  GNOME plugin as working on Solaris since it depends on
+	  gnome-screensaver, which isn't yet integrated in Solaris.
+	* patches/gnome-shell-01-launch.diff: Use pgrep.
+
 2009-07-20 - Matt Lewandowsky <[email protected]>
 
 	* SFEnicstat.spec: Update Source URL

--- a/base-specs/moovida-plugins-good.spec	Tue Jul 21 06:09:03 2009 +0000
+++ b/base-specs/moovida-plugins-good.spec	Tue Jul 21 10:06:28 2009 +0000
@@ -19,6 +19,7 @@
 #date:2008-10-24 owner:yippi type:branding
 # We remove winscreensaver plugin since it only works on the Windows platform.
 Patch1:		   moovida-plugins-good-01-rm-plugins.diff
+#date:2009-07-15 owner:yippi type:branding bugid:399977
 Patch2:            moovida-plugins-good-02-solaris.diff
 
 %description

--- a/base-specs/moovida.spec	Tue Jul 21 06:09:03 2009 +0000
+++ b/base-specs/moovida.spec	Tue Jul 21 10:06:28 2009 +0000
@@ -23,16 +23,16 @@
 URL:               http://www.moovida.com/
 Version:           1.0.5
 Source:            http://www.moovida.com/media/public/%{name}-%{version}.tar.gz
-#date:2008-12-01 owner:fujiwara type:feature
+#date:2008-12-01 owner:fujiwara type:feature bugid:249822
 Patch1:            moovida-01-g11n-localedir.diff
 #date:2008-11-26 owner:yippi type:bug bugid:293805 bugster:6767189
 Patch2:            moovida-02-docs.diff
 #date:2008-11-26 owner:yippi type:branding 
 Patch3:            moovida-03-manpage.diff
-#date:2008-07-18 owner:yippi type:bug bugid:249822
-Patch4:            moovida-04-fixlocale.diff
 #date:2009-03-03 owner:yippi type:feature
-Patch5:            moovida-05-noautoupdate.diff
+Patch4:            moovida-04-noautoupdate.diff
+#date:2009-03-03 owner:yippi type:bug bugid:400137
+Patch5:            moovida-05-pidof.diff
 
 %description
 Moovida is an open source cross-platform media center solution.
@@ -67,5 +67,8 @@
 %{_libdir}/python%{pythonver}/vendor-packages/elisa-*-py%{pythonver}-nspkg.pth
 
 %changelog
+* Tue Jul 21 2009 Brian Cameron <[email protected]>
+- Merge patch 1 and 4, and also fix upstream bug #400137.  Add patch 
+  moovida-05-pidof.diff to address bug #400134.
 * Wed Jul 15 2009 Brian Cameron <[email protected]>
 - Created with version 1.0.5.

--- a/patches/gnome-shell-01-launch.diff	Tue Jul 21 06:09:03 2009 +0000
+++ b/patches/gnome-shell-01-launch.diff	Tue Jul 21 10:06:28 2009 +0000
@@ -12,7 +12,7 @@
  def pidof(command):
 -    pidof_cmd = find_cmd(["/sbin/pidof", "/bin/pidof", "/usr/bin/pidof"])
 -    pidof = subprocess.Popen([pidof_cmd, command], stdout=subprocess.PIPE)
-+    pidof = subprocess.Popen(["/bin/sh", "-c", "/usr/bin/ps -u $USER -o pid,comm | /usr/bin/grep %s | /usr/bin/awk '{print $1}'" % command], stdout=subprocess. PIPE)
++    pidof = subprocess.Popen(["/bin/sh", "-c", "/usr/bin/pgrep -u `whoami` %s" % command], stdout=subprocess. PIPE)
      pids = pidof.communicate()[0].split()
      pidof.wait()
  

--- a/patches/moovida-01-g11n-localedir.diff	Tue Jul 21 06:09:03 2009 +0000
+++ b/patches/moovida-01-g11n-localedir.diff	Tue Jul 21 10:06:28 2009 +0000
@@ -1,6 +1,6 @@
---- elisa-1.0.5/elisa/core/utils/i18n.py-orig	2009-07-15 16:33:57.726981000 -0500
-+++ elisa-1.0.5/elisa/core/utils/i18n.py	2009-07-15 16:34:15.808682000 -0500
-@@ -89,8 +89,7 @@ def get_current_locale():
+--- elisa-1.0.5/elisa/core/utils/i18n.py-orig	2009-07-15 16:43:33.727389000 -0500
++++ elisa-1.0.5/elisa/core/utils/i18n.py	2009-07-21 03:26:46.895600000 -0500
+@@ -89,14 +89,19 @@ def get_current_locale():
  def install_translation(plugin_name, plural = False):
      log_category = 'i18n'
      domain = 'elisa-plugin-%s' % plugin_name
@@ -9,4 +9,18 @@
 +    i18n_dir = "/usr/share/locale"
  
      current_locale = get_current_locale()
-     fallback_locale = current_locale.split('_')[0]
+-    fallback_locale = current_locale.split('_')[0]
++    try:
++        fallback_locale = current_locale.split('_')[0]
++    except AttributeError:
++        fallback_locale = None
+ 
+     try:
+-        t = gettext.translation(domain, i18n_dir, languages=[current_locale, fallback_locale])
++        if current_locale == None:
++            t = gettext.translation(domain, i18n_dir)
++        else:
++            t = gettext.translation(domain, i18n_dir, languages=[current_locale,])
+         translator = t.ugettext
+         translator_plural = t.ungettext
+     except IOError:

--- a/patches/moovida-04-fixlocale.diff	Tue Jul 21 06:09:03 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- elisa-1.0.5/elisa/core/utils/i18n.py-orig	2009-07-15 16:43:33.727389000 -0500
-+++ elisa-1.0.5/elisa/core/utils/i18n.py	2009-07-15 16:43:59.729822000 -0500
-@@ -96,7 +96,10 @@ def install_translation(plugin_name, plu
-     fallback_locale = current_locale.split('_')[0]
- 
-     try:
--        t = gettext.translation(domain, i18n_dir, languages=[current_locale, fallback_locale])
-+        if current_locale == None:
-+            t = gettext.translation(domain, i18n_dir)
-+        else:
-+            t = gettext.translation(domain, i18n_dir, languages=[current_locale,])
-         translator = t.ugettext
-         translator_plural = t.ungettext
-     except IOError:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/moovida-04-noautoupdate.diff	Tue Jul 21 10:06:28 2009 +0000
@@ -0,0 +1,15 @@
+--- elisa-1.0.1/elisa/core/plugin_registry.py-orig	2009-05-28 11:59:06.113068000 -0500
++++ elisa-1.0.1/elisa/core/plugin_registry.py	2009-05-28 11:59:33.201598000 -0500
+@@ -159,9 +159,9 @@ class PluginRegistry(Loggable):
+     config_section_name = 'plugin_registry'
+     default_config = \
+         {'repository': 'http://plugins.moovida.com/plugin_list',
+-         'update_plugin_cache': True,
+-         'auto_update_plugins': True,
+-         'auto_install_new_recommended_plugins': True}
++         'update_plugin_cache': False,
++         'auto_update_plugins': False,
++         'auto_install_new_recommended_plugins': False}
+     config_doc = \
+         {'repository': 'The plugin repository to query for new plugins and ' \
+             'plugin updates.',

--- a/patches/moovida-05-noautoupdate.diff	Tue Jul 21 06:09:03 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- elisa-1.0.1/elisa/core/plugin_registry.py-orig	2009-05-28 11:59:06.113068000 -0500
-+++ elisa-1.0.1/elisa/core/plugin_registry.py	2009-05-28 11:59:33.201598000 -0500
-@@ -159,9 +159,9 @@ class PluginRegistry(Loggable):
-     config_section_name = 'plugin_registry'
-     default_config = \
-         {'repository': 'http://plugins.moovida.com/plugin_list',
--         'update_plugin_cache': True,
--         'auto_update_plugins': True,
--         'auto_install_new_recommended_plugins': True}
-+         'update_plugin_cache': False,
-+         'auto_update_plugins': False,
-+         'auto_install_new_recommended_plugins': False}
-     config_doc = \
-         {'repository': 'The plugin repository to query for new plugins and ' \
-             'plugin updates.',

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/moovida-05-pidof.diff	Tue Jul 21 10:06:28 2009 +0000
@@ -0,0 +1,15 @@
+--- elisa-1.0.5/elisa/core/utils/misc.py-orig	2009-07-21 04:59:22.299642000 -0500
++++ elisa-1.0.5/elisa/core/utils/misc.py	2009-07-21 04:59:59.222810000 -0500
+@@ -219,9 +219,10 @@ def linux_pidof(program_name):
+     @rtype: C{list} of C{int}
+     @returns: the list of running pids of given program name
+     """
+-    output = subprocess.Popen(["pidof", program_name],
++    output = subprocess.Popen(["/bin/sh", "-c", "/usr/bin/pgrep -u `whoami` %s" % program_name],
+                               stderr=subprocess.STDOUT,
+-                              stdout=subprocess.PIPE).communicate()[0]
++                              stdout=subprocess.PIPE,
++                              close_fds=True).communicate()[0]
+     return [int(pid) for pid in output.split()]
+ 
+ def get_user_desktop_name():

--- a/patches/moovida-plugins-good-02-solaris.diff	Tue Jul 21 06:09:03 2009 +0000
+++ b/patches/moovida-plugins-good-02-solaris.diff	Tue Jul 21 10:06:28 2009 +0000
@@ -1,14 +1,3 @@
---- elisa-plugins-good-1.0.5/elisa/plugins/gnome/setup.py-orig	2009-07-15 16:48:30.753809000 -0500
-+++ elisa-plugins-good-1.0.5/elisa/plugins/gnome/setup.py	2009-07-15 16:48:38.085787000 -0500
-@@ -28,7 +28,7 @@ setup(name='elisa-plugin-gnome',
-     license='MIT', 
-     author='Benjamin Kampmann',
-     author_email='[email protected]',
--    platforms=['linux'],
-+    platforms=['linux', 'solaris'],
-     keywords='',
-     namespace_packages=['elisa', 'elisa.plugins'],
-     packages=packages,
 --- elisa-plugins-good-1.0.5/elisa/plugins/hal/setup.py-orig	2009-07-15 16:47:59.576983000 -0500
 +++ elisa-plugins-good-1.0.5/elisa/plugins/hal/setup.py	2009-07-15 16:48:20.076867000 -0500
 @@ -27,7 +27,7 @@ setup(name='elisa-plugin-hal',