rpms/picard/devel picard-0.10-setup.patch, NONE, 1.1 sources, 1.5, 1.6 picard.spec, 1.10, 1.11 .cvsignore, 1.5, 1.6
Alex Lancaster
alexlan at fedoraproject.org
Sun Aug 31 12:05:46 UTC 2008
Author: alexlan
Update of /cvs/extras/rpms/picard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31316
Modified Files:
sources picard.spec .cvsignore
Added Files:
picard-0.10-setup.patch
Log Message:
- 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: sources
===================================================================
RCS file: /cvs/extras/rpms/picard/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 19 Dec 2007 13:02:07 -0000 1.5
+++ sources 31 Aug 2008 12:05:15 -0000 1.6
@@ -1,17 +1 @@
-51c6f1d512b5a4e95d385e1dfe2b8aab picard-0.9.0.tar.gz
-ba58f55711c22ffcf6aa229f008caaa1 bonusdisc.py
-47a9a85385462134c35ab1a2e00844a6 coverart.py
-3614f4157edb858505d387ec0891d6f3 discnumber.py
-d369bb099473e8e81169c39416638742 featartist.py
-abd33550fc54220363940e29c2342cb2 __init__.py
-f58cb1c53d94e22b5c6cd6fcd91a2d5e SearchAmazon3.py
-c2b8a059dd047c7f7b48a0d872373171 SearchAMG.py
-eedcec32b66e89c3ba27ee4c37c11241 SearchCastAlbums3.py
-8a21ef5bf653826efe284ed0ecf3405d SearchDiscogs3.py
-cb6eda6b20d366d8842d9d7fb0793f58 SearchFilmMusziek3.py
-244c26b050d8989f89b793f9e517175e SearchGMR.py
-805bd45b47b38ce25acf40131b489d3d SearchGoogle3.py
-fd656d4fd9f54c85ca41b219eda71b8a SearchLortelArchives3.py
-3451a6d0f826fa19f7ebf13a404468e0 SearchSoundtrackCollector3.py
-b831e73aece0f0a1dad14b63895717b8 SearchSoundtrackINFO3.py
-691cb36b7724362a9986c7a8fbb559f2 ui_options_lastfm.py
+6d4e31446d3a65cbc6ff880947bb500e picard-0.10.tar.gz
Index: picard.spec
===================================================================
RCS file: /cvs/extras/rpms/picard/devel/picard.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- picard.spec 10 Feb 2008 04:54:26 -0000 1.10
+++ picard.spec 31 Aug 2008 12:05:16 -0000 1.11
@@ -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 @@
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,11 @@
%{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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picard/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Dec 2007 13:02:07 -0000 1.5
+++ .cvsignore 31 Aug 2008 12:05:16 -0000 1.6
@@ -1,4 +1,4 @@
-picard-0.9.0.tar.gz
+picard-0.10.tar.gz
bonusdisc.py
coverart.py
discnumber.py
More information about the fedora-extras-commits
mailing list