diff --git a/.cvsignore b/.cvsignore index a50b697..ba10c68 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -exaile_0.2.9.tar.gz +exaile_0.2.10.tar.gz diff --git a/exaile-launch_script.in b/exaile-launch_script.in new file mode 100644 index 0000000..08ac835 --- /dev/null +++ b/exaile-launch_script.in @@ -0,0 +1,7 @@ +#!/bin/bash + + FF_LIBDIR=`cat @GRE_CONF_PATH@ | grep GRE_PATH | sed -e 's/GRE_PATH=//'` + cd @DATADIR@/exaile + export LD_LIBRARY_PATH=$FF_LIBDIR + exec python exaile.py "$@" + diff --git a/exaile-python.patch b/exaile-python.patch deleted file mode 100644 index 9a8b0c4..0000000 --- a/exaile-python.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mmkeys/Makefile 2006-10-31 19:11:34.000000000 -0500 -+++ mmkeys/Makefile.new 2006-12-28 09:27:23.000000000 -0500 -@@ -1,6 +1,6 @@ - # Copyright 2004 Joe Wreschnig. Released under the terms of the GNU GPL. - --PYTHON_DIR = /usr/include/python2.4 -+PYTHON_DIR = `python -c 'from distutils import sysconfig; print sysconfig.get_python_inc()'` - - CFLAGS += -fPIC -O2 `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I$(PYTHON_DIR) - LDFLAGS += `pkg-config --libs gtk+-2.0 pygtk-2.0` diff --git a/exaile.spec b/exaile.spec index 83ace27..bda0c43 100644 --- a/exaile.spec +++ b/exaile.spec @@ -1,26 +1,27 @@ Summary: A music player Name: exaile -Version: 0.2.9 -Release: 4%{?dist} +Version: 0.2.10 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL URL: http://www.exaile.org Source0: http://www.exaile.org/files/exaile_%{version}.tar.gz +Source1: exaile-launch_script.in BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: pygtk2-devel BuildRequires: gtk2-devel -BuildRequires: gstreamer-plugins-good-devel BuildRequires: desktop-file-utils BuildRequires: pkgconfig +BuildRequires: gettext intltool perl(XML::Parser) Requires: python-mutagen >= 1.8 Requires: dbus-python Requires: gstreamer-python >= 0.10 Requires: python-sqlite2 -Requires: pygtk2 -Requires: gnome-python2-gtkhtml2 -Requires: gnome-python2-extras +Requires: pygtk2 +Requires: gnome-python2-gtkhtml2 +Requires: gnome-python2-gtkmozembed Requires: python-CDDB Requires: python-sexy Requires: gamin-python @@ -30,6 +31,12 @@ Requires: gamin-python Requires: python-gpod %endif +%ifarch x86_64 ia64 ppc64 s390x +%define gre_conf %{_sysconfdir}/gre.d/gre64.conf +%else +%define gre_conf %{_sysconfdir}/gre.d/gre.conf +%endif + %description Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+. It incorporates many of the cool things from AmaroK (and other media players) @@ -46,18 +53,18 @@ on your iPod to last.fm %prep %setup -q -n %{name}_%{version} +#Fix typo in the desktop file +sed -i 's/MimeType=M/M/' exaile.desktop # remove shebangs from all files as none should be executable scripts -sed -e '/^#!\//,1 d' -i plugins/*.py -sed -e '/^\s*strip /d' -i mmkeys/Makefile # fix -debuginfo +sed -e '/^#!\//,1 d' -i plugins/*.py exaile.py %build -export CFLAGS="$RPM_OPT_FLAGS" -make %{?_smp_mflags} - +make #%{?_smp_mflags} + %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} desktop-file-install --delete-original \ --vendor="fedora" \ @@ -67,9 +74,12 @@ desktop-file-install --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop -mkdir -p %{buildroot}%{_libdir}/%{name} -mv %{buildroot}%{_datadir}/%{name}/mmkeys.so %{buildroot}%{_libdir}/%{name}/ -chmod 755 %{buildroot}%{_libdir}/%{name}/mmkeys.so +rm -rf %{buildroot}%{_bindir}/exaile +sed 's#@DATADIR@#'%{_datadir}'#g;s#@GRE_CONF_PATH@#'%{gre_conf}'#g' \ + < %{SOURCE1} > %{buildroot}%{_bindir}/exaile +chmod 755 %{buildroot}%{_bindir}/exaile + +chmod 755 %{buildroot}%{_libdir}/exaile/mmkeys.so %find_lang %{name} @@ -84,22 +94,14 @@ rm -rf %{buildroot} %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/exaile.png %{_datadir}/exaile/ +%{_mandir}/man1/exaile*.* %changelog -* Sat Mar 31 2007 Deji Akingunola - 0.2.9-4 -- Yet more runtime dependencies - -* Fri Mar 30 2007 Deji Akingunola - 0.2.9-3 -- Fix typo - -* Fri Mar 30 2007 Deji Akingunola - 0.2.9-2 -- Add more runtime 'requires' (Debarshi Ray, BZ #231794) - -* Wed Mar 27 2007 Deji Akingunola - 0.2.9-1 -- New version 0.2.9 +* Sat Jun 30 2007 Deji Akingunola - 0.2.10-1 +- New release -* Sun Jan 28 2007 Deji Akingunola - 0.2.8-2 -- Fixes for empty debuginfo by Ville Skyttä (Bug #225093) +* Fri Mar 30 2007 Deji Akingunola - 0.2.9-1 +- New release * Tue Jan 09 2007 Deji Akingunola - 0.2.8-1 - New release diff --git a/sources b/sources index 5c87d2d..c8d32c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d52241d30a66286d9483e30e1259d8d4 exaile_0.2.9.tar.gz +776412d9844b06fe26444c0d7f74d712 exaile_0.2.10.tar.gz