[svn] r5982 - trunk/rpms/exaile
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sat Nov 10 22:37:30 CET 2007
Author: hadams
Date: 2007-11-10 22:37:25 +0100 (Sat, 10 Nov 2007)
New Revision: 5982
Added:
trunk/rpms/exaile/exaile-makefile.patch
Removed:
trunk/rpms/exaile/exaile-launch_script.in
Modified:
trunk/rpms/exaile/exaile.spec
Log:
Updated to latest version
Deleted: trunk/rpms/exaile/exaile-launch_script.in
===================================================================
--- trunk/rpms/exaile/exaile-launch_script.in 2007-11-10 17:07:51 UTC (rev 5981)
+++ trunk/rpms/exaile/exaile-launch_script.in 2007-11-10 21:37:25 UTC (rev 5982)
@@ -1,7 +0,0 @@
-#!/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 "$@"
-
Added: trunk/rpms/exaile/exaile-makefile.patch
===================================================================
--- trunk/rpms/exaile/exaile-makefile.patch (rev 0)
+++ trunk/rpms/exaile/exaile-makefile.patch 2007-11-10 21:37:25 UTC (rev 5982)
@@ -0,0 +1,83 @@
+--- Makefile 2007-10-02 12:25:55.000000000 -0400
++++ Makefile-new 2007-10-22 23:41:13.000000000 -0400
+@@ -18,14 +18,14 @@
+
+ make-install-dirs:
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins
++ mkdir -p $(DESTDIR)$(LIBDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/lib
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/gui
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/media
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/panels
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/plugins
+ mkdir -p $(DESTDIR)$(PREFIX)/share/
+ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications
+@@ -41,26 +41,26 @@
+
+ install: make-install-dirs
+ install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1
+- install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
++ install -m 644 exaile.py $(DESTDIR)$(LIBDIR)/exaile
+ install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile
+ install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile
+ install -m 644 sql/*.sql $(DESTDIR)$(PREFIX)/share/exaile/sql
+- -install -m 644 mmkeys.so $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
++ -install -m 644 mmkeys.so $(DESTDIR)$(LIBDIR)/exaile
+ install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images
+ install -m 644 images/default_theme/*.png \
+ $(DESTDIR)$(PREFIX)/share/exaile/images/default_theme
+- install -m 644 xl/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
+- -install -m 644 xl/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
+- install -m 644 xl/media/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
+- -install -m 644 xl/media/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
+- install -m 644 xl/panels/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
+- -install -m 644 xl/panels/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
+- install -m 644 xl/gui/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
+- -install -m 644 xl/gui/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
+- install -m 644 lib/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
+- -install -m 644 lib/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
++ install -m 644 xl/*.py $(DESTDIR)$(LIBDIR)/exaile/xl
++ -install -m 644 xl/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl
++ install -m 644 xl/media/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/media
++ -install -m 644 xl/media/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/media
++ install -m 644 xl/panels/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/panels
++ -install -m 644 xl/panels/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/panels
++ install -m 644 xl/gui/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/gui
++ -install -m 644 xl/gui/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/gui
++ install -m 644 lib/*.py $(DESTDIR)$(LIBDIR)/exaile/lib
++ -install -m 644 lib/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/lib
+ install -m 644 data/*.ini $(DESTDIR)$(PREFIX)/share/exaile/data
+- install -m 644 xl/plugins/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins
++ install -m 644 xl/plugins/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/plugins
+ install -m 644 xl/plugins/*.glade $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins
+ install -m 644 images/largeicon.png \
+ $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
+@@ -71,7 +71,7 @@
+ "cd $(PREFIX)/share/exaile\n" \
+ "export LD_LIBRARY_PATH=\$$LD_LIBRARY_PATH:$(FIREFOX)\n" \
+ "export MOZILLA_FIVE_HOME=$(FIREFOX)\n" \
+- "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
++ "exec python $(LIBDIR)/exaile/exaile.py \"\$$@\"" \
+ > exaile && \
+ chmod 755 exaile
+ for f in `find po -name exaile.mo` ; do \
+@@ -91,7 +91,7 @@
+
+ uninstall:
+ rm -rf $(DESTDIR)$(PREFIX)/share/exaile
+- rm -rf $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
++ rm -rf $(DESTDIR)$(LIBDIR)/exaile
+ rm -rf $(DESTDIR)$(PREFIX)/bin/exaile
+ rm -f $(DESTDIR)$(PREFIX)/share/applications/exaile.desktop
+ rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
Modified: trunk/rpms/exaile/exaile.spec
===================================================================
--- trunk/rpms/exaile/exaile.spec 2007-11-10 17:07:51 UTC (rev 5981)
+++ trunk/rpms/exaile/exaile.spec 2007-11-10 21:37:25 UTC (rev 5982)
@@ -3,20 +3,21 @@
Summary: A music player
Name: exaile
-Version: 0.2.10
-Release: 2
+Version: 0.2.11.1
+Release: 1
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
+Patch0: exaile-makefile.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
BuildRequires: gettext intltool perl(XML::Parser)
+BuildRequires: firefox-devel
Requires: python-mutagen >= 1.8
Requires: dbus-python
@@ -29,11 +30,6 @@
Requires: python-sexy
Requires: gamin-python
-#%if "%fedora" > "6"
-# for iPod device support
-#Requires: python-gpod
-#%endif
-
%ifarch x86_64 ia64 ppc64 s390x
%define gre_conf %{_sysconfdir}/gre.d/gre64.conf
%else
@@ -55,11 +51,10 @@
%prep
%setup -q -n %{name}_%{version}
+%patch0 -p0 -b .fix
-#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 exaile.py
+sed -e '/^#!\//,1 d' -i plugins/*.py xl/plugins/*.py xl/*.py exaile.py
%build
make #%{?_smp_mflags}
@@ -67,19 +62,14 @@
%install
rm -rf %{buildroot}
-make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot}
+make install PREFIX=%{_prefix} LIBDIR=%{_libdir} \
+ FIREFOX=%{firefox_lib} DESTDIR=%{buildroot}
desktop-file-install --delete-original \
--vendor="fedora" \
- --remove-category=Application \
- --remove-category=AudioPlayer \
- --add-category=Audio \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-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
@@ -93,13 +83,17 @@
%defattr(-,root,root,0755)
%doc changelog COPYING TODO
%{_bindir}/exaile
-%{_libdir}/exaile/
+%{_libdir}/exaile
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/exaile.png
%{_datadir}/exaile/
%{_mandir}/man1/exaile*.*
%changelog
+* Sat Nov 10 2007 Heiko Adams <info at fedora-blog.de> - 0.2.11.1-1
+- version update
+
+%changelog
* Sun Jul 22 2007 Heiko Adams <info at fedora-blog.de> - 0.2.10-2
- Rebuild for rpmforge
More information about the svn-commits
mailing list