rpms/quodlibet/devel .cvsignore, 1.4, 1.5 dl-quodlibet-plugins.sh, 1.3, 1.4 quodlibet.spec, 1.14, 1.15 sources, 1.6, 1.7 quodlibet-1.0-libgpod-0.5.2.patch, 1.1, NONE
Jeffrey C. Ollie
jcollie at fedoraproject.org
Mon Jul 6 18:48:05 UTC 2009
Author: jcollie
Update of /cvs/pkgs/rpms/quodlibet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19793
Modified Files:
.cvsignore dl-quodlibet-plugins.sh quodlibet.spec sources
Removed Files:
quodlibet-1.0-libgpod-0.5.2.patch
Log Message:
* Mon Jul 6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-1
- Update to 2.1 based on patches to spec by Andrew Nayenko
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quodlibet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 10 May 2007 18:31:35 -0000 1.4
+++ .cvsignore 6 Jul 2009 18:47:34 -0000 1.5
@@ -1 +1,2 @@
-quodlibet-1.0.tar.gz
+quodlibet-2.1.tar.gz
+quodlibet-plugins.tar.bz2
Index: dl-quodlibet-plugins.sh
===================================================================
RCS file: /cvs/pkgs/rpms/quodlibet/devel/dl-quodlibet-plugins.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dl-quodlibet-plugins.sh 4 Mar 2007 18:41:40 -0000 1.3
+++ dl-quodlibet-plugins.sh 6 Jul 2009 18:47:35 -0000 1.4
@@ -1,44 +1,43 @@
-#!/bin/bash
-
-curdir=$(pwd)
-
-pushd /var/tmp
-
-#
-# Set up directory structure
-#
-
-mkdir quodlibet-plugins-$$
-
-pushd quodlibet-plugins-$$
-
-#
-# download plugins from Quod Libet SVN
-#
-plugin_revision=3996
-plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"
-
-svn -q export -r$plugin_revision $plugin_url
+#!/bin/sh
+revision=quodlibet-2.1
+url='https://quodlibet.googlecode.com/hg/'
+curdir=`pwd`
+tmpdir=/tmp/quodlibet-plugins-$$
+
+# check whether Mercurial is installed
+if ! which hg > /dev/null; then
+ echo ERROR: install the mercurial package >&2
+ exit
+fi
+
+if ! mkdir $tmpdir; then
+ echo ERROR: failed to create temporary directory $tmpdir >&2
+ exit
+fi
+pushd $tmpdir
+
+# unfortunetly Mercurial can't checkout a subdirectory, so we have to download
+# the whole repository
+if ! hg clone -r $revision $url quodlibet; then
+ echo ERROR: failed to checkout sources >&2
+ exit
+fi
# get rid of some plugins that we don't have dependencies for
-rm plugins/songsmenu/brainz.py
-rm plugins/events/lastfmsubmit.py
-
-# don't know where this one went
-#curl -o plugins/songsmenu/shell.2.py "http://www.sacredchao.net/quodlibet/attachment/wiki/Plugins/OpenInShell/shell.2.py?format=raw"
+rm quodlibet/plugins/songsmenu/brainz.py
+rm quodlibet/plugins/events/lastfmsubmit.py
# get rid of any shebang lines
-
-for plugin in `find plugins -name \*.py`
-do
- sed -e '/^#!/,1d' $plugin > $plugin.tmp
- mv $plugin.tmp $plugin
+for plugin in `find quodlibet/plugins -name \*.py`; do
+ sed -i -e '/^#!/,1d' $plugin
done
-tar cjf $curdir/quodlibet-plugins.tar.bz2 plugins
-
-popd
-
-rm -rf quodlibet-plugins-$$
-
-popd
+echo creating archive
+cd quodlibet
+if ! tar cjf $curdir/quodlibet-plugins.tar.bz2 plugins; then
+ echo ERROR: failed to create archive of plugins >&2
+ exit
+fi
+popd > /dev/null
+rm -fR $tmpdir
+echo SUCCESS
Index: quodlibet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quodlibet/devel/quodlibet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- quodlibet.spec 25 Feb 2009 18:29:13 -0000 1.14
+++ quodlibet.spec 6 Jul 2009 18:47:35 -0000 1.15
@@ -1,12 +1,14 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
Name: quodlibet
-Version: 1.0
-Release: 6%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Summary: A music management program
Group: Applications/Multimedia
License: GPLv2
-URL: http://www.sacredchao.net/quodlibet
-Source0: http://www.sacredchao.net/~piman/software/quodlibet-%{version}.tar.gz
+URL: http://code.google.com/p/quodlibet/
+Source0: http://quodlibet.googlecode.com/files/quodlibet-%{version}.tar.gz
Source1: dl-quodlibet-plugins.sh
Source2: quodlibet-plugins.tar.bz2
@@ -14,7 +16,6 @@ Source2: quodlibet-plugins.tar.bz
Source3: google.py
Source4: README.fedora
-Patch0: quodlibet-1.0-libgpod-0.5.2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,10 +32,10 @@ BuildRequires: pkgconfig
BuildRequires: python-ctypes
%endif
-Requires: python-mutagen >= 1.8
+Requires: python-mutagen >= 1.10
Requires: python >= 2.4
-Requires: pygtk2 >= 2.8
-Requires: gstreamer-python >= 0.10
+Requires: pygtk2 >= 2.10
+Requires: gstreamer-python >= 0.10.2
Requires: gnome-python2-canvas
# For tray icon plugin
@@ -65,54 +66,38 @@ Wavpack, and MPEG-4 AAC.
%prep
%setup -q
-%patch0 -p1 -b .libgpod-0.5.2
cp %{S:4} .
%build
-
-# we don't need _trayicon.so because the python libegg bindings are available
-#pushd trayicon
-#make trayicon.c
-#CFLAGS="%{optflags}" %{__python} setup.py build
-#cp build/lib*/trayicon.so ../_trayicon.so
-#popd
-
-pushd mmkeys
-make mmkeyspy.c
-CFLAGS="%{optflags}" %{__python} setup.py build
-cp build/lib*/mmkeys.so ../_mmkeys.so
-popd
+python setup.py build
%install
rm -rf %{buildroot}
-
-mkdir -p %{buildroot}%{_datadir}/quodlibet/
-
-tar xfC %{S:2} %{buildroot}%{_datadir}/quodlibet/
-
-cp %{S:3} %{buildroot}%{_datadir}/quodlibet/plugins/songsmenu
-
-%ifarch x86_64 ppc64
-make install PREFIX=/usr TODEP=lib64/quodlibet DESTDIR=%{buildroot}
-%else
-make install PREFIX=/usr TODEP=lib/quodlibet DESTDIR=%{buildroot}
-%endif
-
-rm -f %{buildroot}%{_datadir}/applications/*.desktop
-make exfalso.desktop quodlibet.desktop
-sed -i 's/;GTK$/&;/' *.desktop
-sed -i 's/AudioPlayer/Player/' quodlibet.desktop
+mkdir -p %{buildroot}%{python_sitelib}/quodlibet/
+tar xfCv %{S:2} %{buildroot}%{python_sitelib}/quodlibet/
+cp -v %{S:3} %{buildroot}%{python_sitelib}/quodlibet/plugins/songsmenu
+
+python setup.py install --root=%{buildroot} --prefix=%{_prefix}
+
+install -dm 755 %{buildroot}%{_datadir}/pixmaps
+install -m 644 build/lib/quodlibet/images/exfalso.png %{buildroot}%{_datadir}/pixmaps
+install -m 644 build/lib/quodlibet/images/quodlibet.png %{buildroot}%{_datadir}/pixmaps
+install -m 644 build/lib/quodlibet/images/quodlibet.png %{buildroot}%{python_sitelib}/quodlibet # needed for Tray Icon plugin
+
+sed -i 's/\.png$//' build/share/applications/*.desktop
+sed -i 's/;GTK$/&;/' build/share/applications/*.desktop
+sed -i 's/AudioPlayer/Player/' build/share/applications/quodlibet.desktop
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
--remove-category Application \
--add-category X-Fedora \
- exfalso.desktop
+ build/share/applications/exfalso.desktop
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
--remove-category Application \
--add-category X-Fedora \
- quodlibet.desktop
-
+ build/share/applications/quodlibet.desktop
+rm -f %{buildroot}%{_datadir}/applications/{exfalso,quodlibet}.desktop
%{find_lang} quodlibet
@@ -126,20 +111,22 @@ rm -rf %{buildroot}
%{_bindir}/exfalso
%{_bindir}/quodlibet
-%{_libdir}/quodlibet
-
%{_datadir}/applications/fedora-exfalso.desktop
%{_datadir}/applications/fedora-quodlibet.desktop
%{_datadir}/pixmaps/exfalso.png
%{_datadir}/pixmaps/quodlibet.png
-%{_datadir}/quodlibet
-
%{_mandir}/man1/exfalso.1*
%{_mandir}/man1/quodlibet.1*
+%{python_sitelib}/quodlibet
+%{python_sitelib}/quodlibet-%{version}-py2.6.egg-info
+
%changelog
+* Mon Jul 6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-1
+- Update to 2.1 based on patches to spec by Andrew Nayenko
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quodlibet/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 10 May 2007 19:03:06 -0000 1.6
+++ sources 6 Jul 2009 18:47:35 -0000 1.7
@@ -1,2 +1,2 @@
-5c925b754bd8505a7a66f2ffcc5b5fe4 quodlibet-1.0.tar.gz
-d9374ca4029aaf7e8851d26355f14f11 quodlibet-plugins.tar.bz2
+abd362699a7118c7720c13fbda0c8c9e quodlibet-2.1.tar.gz
+60e31dd6aa2ea05a7a592fd62e11efb6 quodlibet-plugins.tar.bz2
--- quodlibet-1.0-libgpod-0.5.2.patch DELETED ---
More information about the fedora-extras-commits
mailing list