From ef62056ea08c1ce26e8293fd1d1b9100b6ddff1f Mon Sep 17 00:00:00 2001
From: alexlan <alexlan@fedoraproject.org>
Date: Sep 01 2008 00:48:46 +0000
Subject: - Update to latest upstream (0.10).

- Add patch to work around broken setup.py.
- Fixed some spec file errors: duplicate sources.

---

diff --git a/.cvsignore b/.cvsignore
index d0dd64f..c77e2f1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-picard-0.9.0.tar.gz
+picard-0.10.tar.gz
 bonusdisc.py
 coverart.py
 discnumber.py
diff --git a/picard-0.10-setup.patch b/picard-0.10-setup.patch
new file mode 100644
index 0000000..99e01dd
--- /dev/null
+++ b/picard-0.10-setup.patch
@@ -0,0 +1,11 @@
+--- 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',)))
+ 
diff --git a/picard.spec b/picard.spec
index a26f0cc..2f9d04d 100644
--- a/picard.spec
+++ b/picard.spec
@@ -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:          6%{?dist}
+Version:          0.10
+Release:          1%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -26,12 +24,16 @@ Source10:         SearchAMG.py
 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 @@ track-oriented.
 
 %prep
 %setup -q -n picard-%{version}
+%patch0 -p0
 
 %build
 env %{__python} setup.py config
@@ -63,7 +66,7 @@ env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 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 %{SOURCE15} ${PLUGINDIR}
 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,11 @@ rm -rf $RPM_BUILD_ROOT
 %{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
 
diff --git a/sources b/sources
index 089bb0c..9d1ad32 100644
--- a/sources
+++ b/sources
@@ -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