rpms/gnome-applet-music/F-8 gnome-applet-music-fix-widgets-destdir.patch, NONE, 1.1 gnome-applet-music.spec, 1.19, 1.20

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/gnome-applet-music/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4763/F-8

Modified Files:
	gnome-applet-music.spec 
Added Files:
	gnome-applet-music-fix-widgets-destdir.patch 
Log Message:
Fix bug 449105 (Music Applet Crash)

gnome-applet-music-fix-widgets-destdir.patch:

--- NEW FILE gnome-applet-music-fix-widgets-destdir.patch ---
=== modified file 'src/musicapplet/Makefile.am'
--- src/musicapplet/Makefile.am	2008-04-13 17:21:57 +0000
+++ src/musicapplet/Makefile.am	2007-12-17 04:51:16 +0000
@@ -11,8 +11,7 @@
 nodist_musicapplet_PYTHON = \
 	defs.py
 
-musicappletexecdir = $(pyexecdir)/musicapplet
-musicappletexec_LTLIBRARIES = widgets.la
+musicapplet_LTLIBRARIES = widgets.la
 widgets_la_LDFLAGS = -module -avoid-version -export-symbols-regex initwidgets
 widgets_la_SOURCES = 		\
 	ma-deserialize.c	\



Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-8/gnome-applet-music.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-applet-music.spec	4 May 2008 05:24:04 -0000	1.19
+++ gnome-applet-music.spec	4 Jun 2008 19:49:02 -0000	1.20
@@ -4,7 +4,7 @@
 
 Name:		gnome-applet-music
 Version:	2.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicación del panel GNOME para controlar reproductores de música
 
@@ -14,6 +14,11 @@
 
 Source0:	http://www.kuliniewicz.org/music-applet/downloads/music-applet-%{version}.tar.gz        
 
+## Email sent to upstream with this patch...
+## Message-ID: <1212606274.5427.11.camel at werewolf>
+## Date: Wed, 04 Jun 2008 12:04:35 -0700
+Patch0: 	%{name}-fix-widgets-destdir.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## The build script will give warnings about missing python modules, such as
@@ -24,6 +29,7 @@
 BuildRequires:	gettext
 BuildRequires:	gnome-panel-devel
 BuildRequires:	gnome-python2-devel
+BuildRequires:	libtool
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	pygtk2-devel
 BuildRequires:	python-devel
@@ -94,6 +100,10 @@
 
 %prep
 %setup -qn "music-applet-%{version}"
+%patch0 -b .fix-widgets-destdir
+%{__autoconf}
+%{__aclocal} -I./m4
+%{__automake} src/musicapplet/Makefile
 
 
 %build
@@ -140,15 +150,19 @@
 %{_sysconfdir}/gconf/schemas/music-applet.schemas
 %{_libdir}/bonobo/servers/GNOME_Music_Applet.server
 %{_libdir}/gnome-2.0/ui/GNOME_Music_Applet.xml
-%exclude %{python_sitearch}/%{python_module_name}/*.la
+%exclude %{python_sitelib}/%{python_module_name}/*.la
 %{python_sitelib}/%{python_module_name}/
-%{python_sitearch}/%{python_module_name}/
 %{_libexecdir}/music-applet/
 %{_datadir}/music-applet/
 %{_datadir}/icons/hicolor/*/apps/music-applet-*
 
 
-%changelog
+%changelog 
+* Wed Jun 04 2008 Peter Gordon <peter at thecodergeek.com> - 2.3.1-2
+- Add patch to correct the widgets.so location, which fixes import errors on
+  adding/initializing the applet. Resolves bug 449105 (Music Applet Crash):
+  + fix-widgets-destdir.patch
+
 * Sat May 03 2008 Peter Gordon <peter at thecodergeek.com> - 2.3.1-1
 - Update to new upstream release (2.3.1), which fixes an Amarok plugin crasher
   and contains several updated translations.