rpms/picard/F-7 picard-tagger.py.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 picard.spec, 1.1, 1.2 sources, 1.2, 1.3

Tue Dec 4 11:41:23 UTC 2007

Author: alexlan

Update of /cvs/extras/rpms/picard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8307

Modified Files:
	.cvsignore picard.spec sources 
Added Files:
	picard-tagger.py.patch 
Log Message:
* Tue Dec 04 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-0.6.beta1
- strip out png extension from .desktop file

* Tue Dec 04 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-0.5.beta1
- Add plugins from http://musicbrainz.org/doc/PicardQt/Plugins
- Patch to find proper plugins directory (filed upstream:
  http://bugs.musicbrainz.org/ticket/3430)
- Does not depend on python-musicbrainz2 any longer, uses libdiscid directly


picard-tagger.py.patch:

--- NEW FILE picard-tagger.py.patch ---
--- picard/tagger.py.old	2007-12-04 02:46:41.000000000 -0700
+++ picard/tagger.py	2007-12-04 02:48:43.000000000 -0700
@@ -164,7 +164,7 @@
 
         # Load plugins
         self.pluginmanager = PluginManager()
-        self.pluginmanager.load(os.path.join(os.path.dirname(sys.argv[0]), "plugins"))
+        self.pluginmanager.load(os.path.join(os.path.dirname(picard.__file__), "plugins"))
         self.pluginmanager.load(os.path.join(self.userdir, "plugins"))
 
         self.puidmanager = PUIDManager()


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picard/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2007 01:36:43 -0000	1.2
+++ .cvsignore	4 Dec 2007 11:40:51 -0000	1.3
@@ -1 +1,17 @@
 picard-0.9.0beta1.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-7/picard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- picard.spec	17 Nov 2007 01:36:43 -0000	1.1
+++ picard.spec	4 Dec 2007 11:40:51 -0000	1.2
@@ -5,11 +5,35 @@
 
 Name:             picard
 Version:          0.9.0
-Release:          0.4.%{prerelease}%{?dist}
+Release:          0.6.%{prerelease}%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
 Source0:          http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-%{version}%{prerelease}.tar.gz
+
+# plugins
+Source1:          http://users.musicbrainz.org/~luks/picard-qt/plugins/discnumber.py
+Source2:          http://users.musicbrainz.org/~luks/picard-qt/plugins/featartist.py
+Source3:          http://users.musicbrainz.org/~luks/picard-qt/plugins/coverart.py
+Source4:          http://dispuut-ivv.nl/~jan/bonusdisc.py
+Source5:          http://users.musicbrainz.org/~luks/picard-qt/plugins/lastfm/__init__.py
+Source6:          http://users.musicbrainz.org/~luks/picard-qt/plugins/lastfm/ui_options_lastfm.py
+
+# search plugins
+
+Source10:         SearchAMG.py
+## actual URL http://wiki.musicbrainz.org/PicardQt/Plugins?action=AttachFile&do=get&target=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
+
+Patch0:           picard-tagger.py.patch
 License:          GPLv2+
 Url:              http://musicbrainz.org/doc/PicardTagger
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,12 +42,10 @@
 BuildRequires:    desktop-file-utils
 BuildRequires:    PyQt4 >= 4.3
 BuildRequires:    python-mutagen > 1.9
-BuildRequires:    python-musicbrainz2
 BuildRequires:    libofa-devel
 Requires:         PyQt4 >= 4.3
 Requires:         python-mutagen > 1.9
-Requires:         python-musicbrainz2
-
+Requires:         libdiscid
 
 
 %description
@@ -33,6 +55,7 @@
 
 %prep
 %setup -q -n picard-%{version}%{prerelease}
+%patch0 -p0
 
 %build
 env %{__python} setup.py config
@@ -41,6 +64,9 @@
 %install
 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
+
 %find_lang %{name}
 desktop-file-install --vendor="fedora"                \
   --delete-original --remove-category="Application"   \
@@ -51,6 +77,27 @@
 install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/icons/picard-*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 
+# 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 %{SOURCE4} ${PLUGINDIR}
+mkdir ${PLUGINDIR}/lastfm/
+install -pm 0644 %{SOURCE5} ${PLUGINDIR}/lastfm/
+install -pm 0644 %{SOURCE6} ${PLUGINDIR}/lastfm/
+
+# install search plugins
+install -pm 0644 %{SOURCE10} ${PLUGINDIR}
+install -pm 0644 %{SOURCE11} ${PLUGINDIR}
+install -pm 0644 %{SOURCE12} ${PLUGINDIR}
+install -pm 0644 %{SOURCE13} ${PLUGINDIR}
+install -pm 0644 %{SOURCE14} ${PLUGINDIR}
+install -pm 0644 %{SOURCE15} ${PLUGINDIR}
+install -pm 0644 %{SOURCE16} ${PLUGINDIR}
+install -pm 0644 %{SOURCE17} ${PLUGINDIR}
+install -pm 0644 %{SOURCE18} ${PLUGINDIR}
+
 ## disable tests for the moment
 %check
 %{?_with_check:%{__python} setup.py test || :}
@@ -68,16 +115,25 @@
 %{python_sitearch}/picard/*
 
 %changelog
-* Wed Nov 15 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.0-0.4.beta1
+* Tue Dec 04 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-0.6.beta1
+- strip out png extension from .desktop file
+
+* Tue Dec 04 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-0.5.beta1
+- Add plugins from http://musicbrainz.org/doc/PicardQt/Plugins
+- Patch to find proper plugins directory (filed upstream:
+  http://bugs.musicbrainz.org/ticket/3430)
+- Does not depend on python-musicbrainz2 any longer, uses libdiscid directly 
+
+* Wed Nov 15 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-0.4.beta1
 - Various minor spec file cleanups to make sure timestamps stay correct
 
-* Wed Nov 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.0-0.3.beta1
+* Wed Nov 14 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-0.3.beta1
 - Create pixmaps directory
 
-* Wed Nov 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.0-0.2.beta1
+* Wed Nov 14 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-0.2.beta1
 - Missing BR: python-devel
 - Use sitearch to make sure x86_64 builds work
 - Install icons share/pixmaps/, rather than share/icons/
 
-* Wed Nov 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.0-0.1.beta1
+* Wed Nov 14 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-0.1.beta1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/picard/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2007 01:36:43 -0000	1.2
+++ sources	4 Dec 2007 11:40:51 -0000	1.3
@@ -1 +1,17 @@
 2568970e4b2112fc03afafd441186a5b  picard-0.9.0beta1.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


