[picard] Update to latest upstream 1.0 (#827880) Use versions of plugins now distributed in contrib/plugins U
alexlan
alexlan at fedoraproject.org
Mon Jun 4 18:39:32 UTC 2012
commit 65dc308098476ddf3259ff9e9d55d0c3c3828245
Author: Alex Lancaster <alexlan[AT]fedoraproject org>
Date: Mon Jun 4 14:39:20 2012 -0400
Update to latest upstream 1.0 (#827880)
Use versions of plugins now distributed in contrib/plugins
Update BR for PyQt >= 4.6 (#757398)
Drop obsolete conditional in %%files (#757234)
.gitignore | 1 +
__init__lastfm.py | 177 ------------------------------------------
__init__replaygain.py | 141 ---------------------------------
addrelease.py | 78 ------------------
classicdiscnumber.py | 21 -----
coverart.py | 189 --------------------------------------------
cuesheet.py | 194 ----------------------------------------------
discnumber.py | 26 ------
featartist.py | 13 ---
featartistsintitles.py | 23 ------
no_release.py | 104 -------------------------
open_in_gui.py | 63 ---------------
options_lastfm.ui | 187 --------------------------------------------
options_replaygain.ui | 99 -----------------------
picard.spec | 103 +++++++++++++-----------
release_type.py | 36 ---------
sources | 2 +-
swapprefix.py | 52 ------------
titlecase.py | 60 --------------
titlesort.py | 59 --------------
titleversion.py | 27 -------
tracks2clipboard.py | 52 ------------
ui_options_lastfm.py | 125 -----------------------------
ui_options_replaygain.py | 66 ----------------
24 files changed, 58 insertions(+), 1840 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0df7454..310ae9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
picard-0.15beta1.tar.gz
/picard-0.15.1.tar.gz
/picard-0.16.tar.gz
+/picard-1.0.tar.gz
diff --git a/picard.spec b/picard.spec
index becb16d..b73da5e 100644
--- a/picard.spec
+++ b/picard.spec
@@ -2,35 +2,35 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: picard
-Version: 0.16
-Release: 2%{?dist}
+Version: 1.0
+Release: 1%{?dist}
Summary: MusicBrainz-based audio tagger
Group: Applications/Multimedia
Source0: http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-%{version}.tar.gz
-# plugins
-Source1: http://users.musicbrainz.org/~luks/picard-plugins/discnumber.py
-Source2: http://users.musicbrainz.org/~luks/picard-plugins/featartist.py
-Source3: http://users.musicbrainz.org/~luks/picard-plugins/coverart.py
-# actual location: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/__init__.py
-# had to rename SOURCE4 to avoid namespace conflict with replaygain
-Source4: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/__init__lastfm.py
-Source5: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/ui_options_lastfm.py
-Source6: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/options_lastfm.ui
-Source7: http://users.musicbrainz.org/~luks/picard-plugins/cuesheet.py
-Source8: http://users.musicbrainz.org/~luks/picard-plugins/open_in_gui.py
-Source9: http://users.musicbrainz.org/~luks/picard-plugins/swapprefix.py
-Source10: http://users.musicbrainz.org/~luks/picard-plugins/titlecase.py
-Source11: http://users.musicbrainz.org/~luks/picard-plugins/tracks2clipboard.py
-# actual location: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/__init__..py
-Source12: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/__init__replaygain.py
-Source13: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/ui_options_replaygain.py
-Source14: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/options_replaygain.ui
-Source15: http://users.musicbrainz.org/~luks/picard-plugins/featartistsintitles.py
-Source16: http://users.musicbrainz.org/~luks/picard-plugins/release_type.py
-Source17: http://users.musicbrainz.org/~luks/picard-plugins/no_release.py
-Source18: http://gitorious.org/musicbrainz/addrelease/blobs/raw/master/addrelease.py
+# plugins, now distributed inside contrib/plugins directory,
+# keep upstream URLs around in case we want to add upstream version
+#Source1: http://users.musicbrainz.org/~luks/picard-plugins/discnumber.py
+#Source2: http://users.musicbrainz.org/~luks/picard-plugins/featartist.py
+#Source3: http://users.musicbrainz.org/~luks/picard-plugins/coverart.py
+#Source4: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/__init__.py
+#Source5: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/ui_options_lastfm.py
+#Source6: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/options_lastfm.ui
+#Source7: http://users.musicbrainz.org/~luks/picard-plugins/cuesheet.py
+#Source8: http://users.musicbrainz.org/~luks/picard-plugins/open_in_gui.py
+#Source9: http://users.musicbrainz.org/~luks/picard-plugins/swapprefix.py
+#Source10: http://users.musicbrainz.org/~luks/picard-plugins/titlecase.py
+#Source11: http://users.musicbrainz.org/~luks/picard-plugins/tracks2clipboard.py
+#Source12: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/__init__.py
+#Source13: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/ui_options_replaygain.py
+#Source14: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/options_replaygain.ui
+#Source15: http://users.musicbrainz.org/~luks/picard-plugins/featartistsintitles.py
+#Source16: http://users.musicbrainz.org/~luks/picard-plugins/release_type.py
+#Source17: http://users.musicbrainz.org/~luks/picard-plugins/no_release.py
+#Source18: http://gitorious.org/musicbrainz/addrelease/blobs/raw/master/addrelease.py
+
+# not yet included in contrib/ directory
Source19: http://github.com/voiceinsideyou/creaps-picard-plugins/raw/master/titlesort.py
Source20: http://github.com/voiceinsideyou/creaps-picard-plugins/raw/master/titleversion.py
@@ -43,10 +43,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: desktop-file-utils
-BuildRequires: PyQt4 >= 4.3
+BuildRequires: PyQt4 >= 4.6
BuildRequires: python-mutagen > 1.9
BuildRequires: libofa-devel
-Requires: PyQt4 >= 4.3
+Requires: PyQt4 >= 4.6
Requires: python-mutagen > 1.9
Requires: libdiscid
@@ -75,26 +75,31 @@ desktop-file-install --vendor="fedora" \
# install plugins
PLUGINDIR=$RPM_BUILD_ROOT%{python_sitearch}/picard/plugins/
-install -pm 0644 %{SOURCE1} ${PLUGINDIR}
-install -pm 0644 %{SOURCE2} ${PLUGINDIR}
-install -pm 0644 %{SOURCE3} ${PLUGINDIR}
+install -pm 0644 contrib/plugins/discnumber.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/featartist.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/coverart.py ${PLUGINDIR}
mkdir ${PLUGINDIR}/lastfm/
-install -pm 0644 %{SOURCE4} ${PLUGINDIR}/lastfm/__init__.py
-install -pm 0644 %{SOURCE5} ${PLUGINDIR}/lastfm/
-install -pm 0644 %{SOURCE6} ${PLUGINDIR}/lastfm/
-install -pm 0644 %{SOURCE7} ${PLUGINDIR}
-install -pm 0644 %{SOURCE8} ${PLUGINDIR}
-install -pm 0644 %{SOURCE9} ${PLUGINDIR}
-install -pm 0644 %{SOURCE10} ${PLUGINDIR}
-install -pm 0644 %{SOURCE11} ${PLUGINDIR}
+install -pm 0644 contrib/plugins/lastfm/__init__.py ${PLUGINDIR}/lastfm/
+install -pm 0644 contrib/plugins/lastfm/ui_options_lastfm.py ${PLUGINDIR}/lastfm/
+install -pm 0644 contrib/plugins/lastfm/options_lastfm.ui ${PLUGINDIR}/lastfm/
+install -pm 0644 contrib/plugins/cuesheet.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/open_in_gui.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/swapprefix.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/titlecase.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/tracks2clipboard.py ${PLUGINDIR}
mkdir ${PLUGINDIR}/replaygain/
-install -pm 0644 %{SOURCE12} ${PLUGINDIR}/replaygain/__init__.py
-install -pm 0644 %{SOURCE13} ${PLUGINDIR}/replaygain/
-install -pm 0644 %{SOURCE14} ${PLUGINDIR}/replaygain/
-install -pm 0644 %{SOURCE15} ${PLUGINDIR}
-install -pm 0644 %{SOURCE16} ${PLUGINDIR}
-install -pm 0644 %{SOURCE17} ${PLUGINDIR}
-install -pm 0644 %{SOURCE18} ${PLUGINDIR}
+install -pm 0644 contrib/plugins/replaygain/__init__.py ${PLUGINDIR}/replaygain/
+install -pm 0644 contrib/plugins/replaygain/ui_options_replaygain.py ${PLUGINDIR}/replaygain/
+install -pm 0644 contrib/plugins/replaygain/options_replaygain.ui ${PLUGINDIR}/replaygain/
+install -pm 0644 contrib/plugins/featartistsintitles.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/release_type.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/no_release.py ${PLUGINDIR}
+install -pm 0644 contrib/plugins/addrelease.py ${PLUGINDIR}
+mkdir ${PLUGINDIR}/lastfmplus/
+install -pm 0644 contrib/plugins/lastfmplus/__init__.py ${PLUGINDIR}/lastfmplus/
+install -pm 0644 contrib/plugins/lastfmplus/ui_options_lastfm.py ${PLUGINDIR}/lastfmplus/
+install -pm 0644 contrib/plugins/classicdiscnumber.py ${PLUGINDIR}
+
install -pm 0644 %{SOURCE19} ${PLUGINDIR}
install -pm 0644 %{SOURCE20} ${PLUGINDIR}
@@ -114,17 +119,21 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/picard
%{_datadir}/applications/fedora-picard.desktop
%{_datadir}/icons/hicolor/*/apps/picard.png
-%if 0%{?fedora} >= 9
%{python_sitearch}/*egg-info
-%endif
%dir %{python_sitearch}/picard
%{python_sitearch}/picard/*
%changelog
+* Mon Jun 4 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.0-1
+- Update to latest upstream 1.0 (#827880)
+- Use versions of plugins now distributed in contrib/plugins
+- Update BR for PyQt >= 4.6 (#757398)
+- Drop obsolete conditional in %%files (#757234)
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-* Mon Nov 14 2011 <alex at sup35.ccdom.wi.mit.edu> - 0.16-1
+* Mon Nov 14 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.16-1
- Update to 0.16
- Update plugins, add titlesort, titleversion plugins.
diff --git a/sources b/sources
index 37a3097..287bd0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5791a5ae1ce92ac1ffb1cc8f15917ad7 picard-0.16.tar.gz
+2ac5d31763caaf1e6d374049ca4c134e picard-1.0.tar.gz
More information about the scm-commits
mailing list