rpms/picard/F-8 picard-0.10-setup.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 picard.spec, 1.3, 1.4 sources, 1.4, 1.5

[Alex Lancaster]

Author: alexlan

Update of /cvs/extras/rpms/picard/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13431

Modified Files:
	.cvsignore picard.spec sources 
Added Files:
	picard-0.10-setup.patch 
Log Message:
* Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
- Update to latest upstream (0.10).
- Add patch to work around broken setup.py.
- Fixed some spec file errors: duplicate sources.


picard-0.10-setup.patch:

--- NEW FILE picard-0.10-setup.patch ---
--- setup.py.orig	2008-08-31 04:47:07.000000000 -0700
+++ setup.py	2008-08-31 04:47:17.000000000 -0700
@@ -507,7 +507,7 @@
     args['cmdclass'] = { 'py2app' : BuildAPP }
 
 # FIXME: this should check for the actual command ('install' vs. 'bdist_nsis', 'py2app', ...), not installed libraries
-if py2exe is None and do_py2app is None:
+if py2exe is None and do_py2app is False:
     args['data_files'].append(('share/icons', ('picard-16.png', 'picard-32.png')))
     args['data_files'].append(('share/applications', ('picard.desktop',)))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Dec 2007 08:47:09 -0000	1.4
+++ .cvsignore	1 Sep 2008 00:54:41 -0000	1.5
@@ -1 +1,17 @@
-picard-0.9.0.tar.gz
+picard-0.10.tar.gz
+bonusdisc.py
+coverart.py
+discnumber.py
+featartist.py
+__init__.py
+SearchAmazon3.py
+SearchAMG.py
+SearchCastAlbums3.py
+SearchDiscogs3.py
+SearchFilmMusziek3.py
+SearchGMR.py
+SearchGoogle3.py
+SearchLortelArchives3.py
+SearchSoundtrackCollector3.py
+SearchSoundtrackINFO3.py
+ui_options_lastfm.py


Index: picard.spec
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/picard.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- picard.spec	23 Dec 2007 08:47:09 -0000	1.3
+++ picard.spec	1 Sep 2008 00:54:41 -0000	1.4
@@ -1,11 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define prerelease beta1
-
 Name:             picard
-Version:          0.9.0
-Release:          5%{?dist}
+Version:          0.10
+Release:          1%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -26,12 +24,16 @@
 Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
 Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
 Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
-Source13:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
-Source14:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
-Source15:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
-Source16:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
-Source17:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
-Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
+Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
+Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
+Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
+Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
+Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+
+# setup.py doesn't run installation of datadir properly without this patch
+# filed upstream at: http://bugs.musicbrainz.org/ticket/3934
+Patch0:		  %{name}-0.10-setup.patch
 
 License:          GPLv2+
 Url:              http://musicbrainz.org/doc/PicardTagger
@@ -54,6 +56,7 @@
 
 %prep
 %setup -q -n picard-%{version}
+%patch0 -p0
 
 %build
 env %{__python} setup.py config
@@ -63,7 +66,7 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 # strip out png extension from .desktop file
-sed -e 's/picard-32.png/picard-32/' picard.desktop > $RPM_BUILD_ROOT/%{_datadir}/applications/picard.desktop
+sed -e 's/picard-32.png/picard-32/' picard.desktop > $RPM_BUILD_ROOT%{_datadir}/applications/picard.desktop
 
 %find_lang %{name}
 desktop-file-install --vendor="fedora"                \
@@ -95,6 +98,7 @@
 install -pm 0644 %{SOURCE16} ${PLUGINDIR}
 install -pm 0644 %{SOURCE17} ${PLUGINDIR}
 install -pm 0644 %{SOURCE18} ${PLUGINDIR}
+install -pm 0644 %{SOURCE19} ${PLUGINDIR}
 
 ## disable tests for the moment
 %check
@@ -116,6 +120,14 @@
 %{python_sitearch}/picard/*
 
 %changelog
+* Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
+- Update to latest upstream (0.10).
+- Add patch to work around broken setup.py.
+- Fixed some spec file errors: duplicate sources.
+
+* Sat Feb  9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.9.0-6
+- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
+
 * Wed Dec 19 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-5
 - Add support for python eggs for F9+
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Dec 2007 08:47:09 -0000	1.4
+++ sources	1 Sep 2008 00:54:41 -0000	1.5
@@ -1,4 +1,4 @@
-51c6f1d512b5a4e95d385e1dfe2b8aab  picard-0.9.0.tar.gz
+6d4e31446d3a65cbc6ff880947bb500e  picard-0.10.tar.gz
 ba58f55711c22ffcf6aa229f008caaa1  bonusdisc.py
 47a9a85385462134c35ab1a2e00844a6  coverart.py
 3614f4157edb858505d387ec0891d6f3  discnumber.py