rpms/gnome-applet-music/F-9 gnome-applet-music.spec, 1.22, 1.23 gnome-applet-music-fix-widgets-destdir.patch, 1.1, NONE
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Thu Jun 5 02:23:03 UTC 2008
Author: pgordon
Update of /cvs/pkgs/rpms/gnome-applet-music/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3076/F-9
Modified Files:
gnome-applet-music.spec
Removed Files:
gnome-applet-music-fix-widgets-destdir.patch
Log Message:
A more concise, less-kludgy, and properly-upstreamed fix for bug 449105.
Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-9/gnome-applet-music.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-applet-music.spec 4 Jun 2008 19:35:45 -0000 1.22
+++ gnome-applet-music.spec 5 Jun 2008 02:22:12 -0000 1.23
@@ -14,11 +14,6 @@
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
@@ -29,7 +24,6 @@
BuildRequires: gettext
BuildRequires: gnome-panel-devel
BuildRequires: gnome-python2-devel
-BuildRequires: libtool
BuildRequires: perl(XML::Parser)
BuildRequires: pygtk2-devel
BuildRequires: python-devel
@@ -100,10 +94,6 @@
%prep
%setup -qn "music-applet-%{version}"
-%patch0 -b .fix-widgets-destdir
-%{__autoconf}
-%{__aclocal} -I./m4
-%{__automake} src/musicapplet/Makefile
%build
@@ -114,7 +104,7 @@
%install
rm -rf %{buildroot}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} pyexecdir=%{python_sitelib}
%find_lang music-applet
@@ -158,6 +148,12 @@
%changelog
+* Wed Jun 04 2008 Peter Gordon <peter at thecodergeek.com>
+- Apply proper fix from upstream, adding a pyexecdir setting to the 'make
+ install' invocation (following the automake manual for it) instead of
+ reverting the BZR change. Drop the now-unnecessary patch:
+ - fix-widgets-destdir.patch
+
* 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):
--- gnome-applet-music-fix-widgets-destdir.patch DELETED ---
More information about the fedora-extras-commits
mailing list