rpms/mumbles/devel mumbles-firefox-uri.patch, NONE, 1.1 mumbles-sitedir.patch, 1.1, 1.2 mumbles.spec, 1.3, 1.4

[John Anderson]

Author: janderson

Update of /cvs/pkgs/rpms/mumbles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13846

Modified Files:
	mumbles-sitedir.patch mumbles.spec 
Added Files:
	mumbles-firefox-uri.patch 
Log Message:


mumbles-firefox-uri.patch:

--- NEW FILE mumbles-firefox-uri.patch ---
diff -uNr mumbles-0.4-orig/src/plugins/eggs/firefox/src/__init__.py mumbles-0.4/src/plugins/eggs/firefox/src/__init__.py
--- mumbles-0.4-orig/src/plugins/eggs/firefox/src/__init__.py	2007-08-26 21:31:41.000000000 -0500
+++ mumbles-0.4/src/plugins/eggs/firefox/src/__init__.py	2009-01-09 09:34:13.000000000 -0600
@@ -46,4 +46,5 @@
  	def open_uri(self, uri):
  		mime_type = gnomevfs.get_mime_type(uri)
  		application = gnomevfs.mime_get_default_application(mime_type)
- 		os.system(application[2] + ' "' + uri + '" &')
+		os.environ['URI'] = uri
+		os.system(application[2] + ' "$URI" &')

mumbles-sitedir.patch:

Index: mumbles-sitedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/devel/mumbles-sitedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mumbles-sitedir.patch	4 Jan 2009 21:03:55 -0000	1.1
+++ mumbles-sitedir.patch	9 Jun 2009 02:41:58 -0000	1.2
@@ -13,7 +13,7 @@ diff -uNr mumbles-0.4-orig/bin/mumbles m
  
 -sys.path.append("/usr/share/python-support/mumbles/src/")
 +from distutils.sysconfig import get_python_lib
-+syspath = get_python_lib(1)+"/mumbles"
++syspath = get_python_lib(0)+"/mumbles"
 +sys.path.append(syspath)
  os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")
  
@@ -27,7 +27,7 @@ diff -uNr mumbles-0.4-orig/bin/mumbles-s
  
 -sys.path.append("/usr/share/python-support/mumbles/src/")
 +from distutils.sysconfig import get_python_lib
-+syspath = get_python_lib(1)+"/mumbles"
++syspath = get_python_lib(0)+"/mumbles"
 +sys.path.append(syspath)
 +print "syspath: %s" % (syspath)
  os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")


Index: mumbles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/devel/mumbles.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mumbles.spec	26 Feb 2009 03:24:20 -0000	1.3
+++ mumbles.spec	9 Jun 2009 02:41:58 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		mumbles
 Version:	0.4
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	A plugin driven DBus based notification system for the Gnome desktop
 
 Group:		User Interface/Desktops
@@ -13,6 +13,7 @@ Source0:	http://downloads.sourceforge.ne
 #		The default setup.py uses src as the python package name and doesn't
 #		have the correct search path. Submitted upstream id #2307852
 Patch0:		mumbles-sitedir.patch
+Patch1:		mumbles-firefox-uri.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
@@ -21,7 +22,7 @@ BuildRequires:	desktop-file-utils
 
 BuildArch:	noarch
 
-Requires:	pygtk2 dbus dbus-python pycairo pygtk2-libglade
+Requires:	pygtk2 dbus dbus-python pycairo pygtk2-libglade python-setuptools
 
 %description
 Mumbles is a plugin driven, DBus based notification system written for the
@@ -31,11 +32,20 @@ aims to provide a modern notification sy
 %prep
 %setup -q -n mumbles-%{version}
 %patch0 -p1 -b .sitedir
+%patch1 -p1 -b .firefoxuri
 
 # small fix to avoid warning from desktop-file-install
 sed -i 's!mumbles.png!mumbles!' bin/mumbles.desktop
 
 %build
+
+#rebuild the Firefox plugin to apply the uri patch
+pushd .
+cd src/plugins/eggs/firefox
+python setup.py bdist_egg
+cp dist/FirefoxMumbles-0.1-py%{python_version}.egg ../../
+popd
+
 CFLAGS="%{optflags}" %{__python} setup.py build
 
 %install
@@ -90,6 +100,11 @@ fi
 
 
 %changelog
+* Mon Jun  8 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-10
+- Fixed path to make mumbles run on x86_64 bug #479158
+- Security fix for Firefox plugin bug #479171
+- Added buildrequires to fix bug #481188
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild